httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
Date Wed, 29 Nov 2000 01:57:47 GMT
wrowe       00/11/28 17:57:47

  Modified:    src/modules/mpm/winnt mpm_winnt.c
  Log:
    Compile break when I changed 'thread' in mpm_winnt.h to a HANDLE type. Fixed.
  
  Revision  Changes    Path
  1.113     +5 -5      apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- mpm_winnt.c	2000/11/29 01:50:02	1.112
  +++ mpm_winnt.c	2000/11/29 01:57:46	1.113
  @@ -1163,7 +1163,7 @@
       /* TODO: Add code to clean-up completion contexts here */
   }
   
  -static void cleanup_thread(thread **handles, int *thread_cnt, int thread_to_clean)
  +static void cleanup_thread(thread *handles, int *thread_cnt, int thread_to_clean)
   {
       int i;
   
  @@ -1204,7 +1204,7 @@
       char* exit_event_name;
       int nthreads = ap_threads_per_child;
       int tid;
  -    thread **child_handles;
  +    thread *child_handles;
       int rv;
       time_t end_time;
       int i;
  @@ -1267,10 +1267,10 @@
       /* Create the worker thread pool */
       ap_log_error(APLOG_MARK,APLOG_INFO, APR_SUCCESS, server_conf, 
                    "Child %d: Starting %d worker threads.", my_pid, nthreads);
  -    child_handles = (thread *) alloca(nthreads * sizeof(int));
  +    child_handles = (thread) alloca(nthreads * sizeof(int));
       for (i = 0; i < nthreads; i++) {
  -        child_handles[i] = (thread *) _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE)
worker_main,
  -                                                     NULL, 0, &tid);
  +        child_handles[i] = (thread) _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE) worker_main,
  +                                                   NULL, 0, &tid);
       }
   
       /* Begin accepting connections */
  
  
  

Mime
View raw message