cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c

[rbb]

rbb         99/10/16 13:52:33

  Modified:    src/lib/apr/threadproc/win32 proc.c
  Log:
  Fix some problems caused by the parameter swap merges.
  
  Revision  Changes    Path
  1.10      +1 -12     apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- proc.c    1999/10/15 14:20:26     1.9
  +++ proc.c    1999/10/16 20:52:32     1.10
  @@ -171,15 +171,9 @@
       return APR_SUCCESS;
   }
   
  -<<<<<<< proc.c
  -ap_status_t ap_create_process(struct proc_t **new, char *progname, 
  -                              char *const args[], char **env, 
  -                              struct procattr_t *attr, ap_context_t *cont)
  -=======
   ap_status_t ap_create_process(struct proc_t **new, const char *progname, 
                                 char *const args[], char **env, 
                                 struct procattr_t *attr, ap_context_t *cont)
  ->>>>>>> 1.8
   {
       int i, iEnvBlockLen;
       char *cmdline;
  @@ -382,7 +376,7 @@
           return APR_ENOPROC;
       }
   }
  -/*
  +
   ap_status_t ap_set_procdata(void *data, char *key,
                               ap_status_t (*cleanup) (void *)
                               struct proc_t *proc)
  @@ -395,13 +389,8 @@
           return APR_ENOPROC;
       }
   }
  -<<<<<<< proc.c
   
   ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
  -=======
  -*/
  -ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
  ->>>>>>> 1.8
   {
       if (proc == NULL) {
           return APR_ENOPROC;