cvs commit: jakarta-commons-sandbox/daemon/src/native/nt/procrun procrun.c

[mt...@apache.org]

mturk       2003/09/04 05:31:15

  Modified:    daemon/src/native/nt/procrun procrun.c
  Log:
  Change the ttyConsoleCtrlThread() to ttyConsoleCtrlThread(LPVOID)
  
  Revision  Changes    Path
  1.28      +6 -6      jakarta-commons-sandbox/daemon/src/native/nt/procrun/procrun.c
  
  Index: procrun.c
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/nt/procrun/procrun.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- procrun.c	14 Aug 2003 15:52:31 -0000	1.27
  +++ procrun.c	4 Sep 2003 12:31:15 -0000	1.28
  @@ -134,7 +134,7 @@
       FILE *fd;
       fd = fopen("c:\\jakarta-service.txt","a");
       if (fd == NULL)
  -	return;
  +    return;
       fprintf(fd,string);
       if (string[strlen(string)-1]!='\n')
           fprintf(fd,"\n");
  @@ -168,7 +168,7 @@
               write(g_proc_stderr_file, tid, strlen(tid));
           else
               fprintf(stderr,tid);
  -	log_write(tid);
  +    log_write(tid);
   #ifdef _DEBUG_TRACE
           OutputDebugString(tid);
   #endif
  @@ -1089,7 +1089,7 @@
               return -1;
           } else if (proc->java.jbin != NULL) {
               DBPRINTF0("forking no need to load java dll\n");
  -	    return 0; // If forking, don't bother with the load.
  +        return 0; // If forking, don't bother with the load.
           }
           /* Try to load the jvm dll */ 
           em = SetErrorMode(SEM_FAILCRITICALERRORS);
  @@ -1629,7 +1629,7 @@
           }
           env->m->argw = nargw;
           program = env->m->java.jbin;
  -	return program;
  +    return program;
   }
   
   int procrun_redirect(char *program, char **envp, procrun_t *env, int starting)
  @@ -2409,7 +2409,7 @@
   static LRESULT CALLBACK ttyConsoleCtrlWndProc(HWND hwnd, UINT msg,
                                                 WPARAM wParam, LPARAM lParam)
   {
  -    int   qreturn;
  +
       if (msg == WM_CREATE) {
           DBPRINTF0("ttyConsoleCtrlWndProc WM_CREATE\n");
           return 0;
  @@ -2450,7 +2450,7 @@
    * tty's context, and visa versa, so the subclass procedure and this hidden
    * window work together to make it all happen.
    */
  -static DWORD WINAPI ttyConsoleCtrlThread()
  +static DWORD WINAPI ttyConsoleCtrlThread(LPVOID param)
   {
       HWND monitor_hwnd;
       WNDCLASS wc;