httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
Date Sun, 09 Jul 2000 04:10:25 GMT
fielding    00/07/08 21:10:25

  Modified:    src/modules/mpm/winnt mpm_winnt.c
  Log:
  Change variable name to avoid conflict with typedef.  Yes, it's anal.
  
  Revision  Changes    Path
  1.87      +3 -3      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.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- mpm_winnt.c	2000/07/08 17:03:29	1.86
  +++ mpm_winnt.c	2000/07/09 04:10:24	1.87
  @@ -1171,7 +1171,7 @@
       HANDLE child_events[2];
       char* exit_event_name;
       int nthreads = ap_threads_per_child;
  -    int thread_id;
  +    int tid;
       thread **child_handles;
       int rv;
       time_t end_time;
  @@ -1238,14 +1238,14 @@
       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, &thread_id);
  +                                                     NULL, 0, &tid);
       }
   
       /* Begin accepting connections */
       if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
           /* Win95/98: Start the accept thread */
           _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE) accept_and_queue_connections,
  -                       (void *) i, 0, &thread_id);
  +                       (void *) i, 0, &tid);
       } else {
           /* Windows NT/2000: Create AcceptEx completion contexts */
           create_listeners();
  
  
  

Mime
View raw message