From 140a661c69e58fcaf99671ac152be39a49bfcfb4 Mon Sep 17 00:00:00 2001 From: "Roy T. Fielding" Date: Sun, 9 Jul 2000 04:10:24 +0000 Subject: [PATCH] Change variable name to avoid conflict with typedef. Yes, it's anal. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85795 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/winnt/mpm_winnt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 4567072d96..0017271ed2 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -1171,7 +1171,7 @@ static void child_main() 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 @@ static void child_main() 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(); -- 2.40.0