stoddard 99/10/11 08:40:03
Modified: src/modules/mpm/winnt winnt.c Log: Yarg... more argument swaps... Revision Changes Path 1.19 +5 -5 apache-2.0/src/modules/mpm/winnt/winnt.c Index: winnt.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- winnt.c 1999/10/10 20:35:06 1.18 +++ winnt.c 1999/10/11 15:40:00 1.19 @@ -1059,7 +1059,7 @@ } allowed_globals.jobsemaphore = create_semaphore(0); - ap_create_lock(pchild, APR_MUTEX, APR_INTRAPROCESS, NULL, &allowed_globals.jobmutex); + ap_create_lock(&allowed_globals.jobmutex, APR_MUTEX, APR_INTRAPROCESS, NULL, pchild); /* spawn off accept thread (WIN9x only) */ if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) { @@ -1312,7 +1312,7 @@ lpWSAProtocolInfo = ap_pcalloc(p, sizeof(WSAPROTOCOL_INFO)); ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, server_conf, "Parent: Duplicating socket %d and sending it to child process %d", lr->sd, pi.dwProcessId); - ap_get_os_sock(lr->sd,&nsd); + ap_get_os_sock(&nsd,lr->sd); if (WSADuplicateSocket(nsd, pi.dwProcessId, lpWSAProtocolInfo) == SOCKET_ERROR) { @@ -1567,11 +1567,11 @@ exit_event_name = ap_psprintf(pconf, "apC%d", my_pid); setup_signal_names(ap_psprintf(pconf,"ap%d", parent_pid)); if (one_process) { - ap_create_lock(pconf,APR_MUTEX, APR_CROSS_PROCESS,signal_name_prefix,&start_mutex); + ap_create_lock(&start_mutex,APR_MUTEX, APR_CROSS_PROCESS,signal_name_prefix,pconf); exit_event = create_exit_event(exit_event_name); } else { - ap_child_init_lock(&start_mutex, pconf, signal_name_prefix); + ap_child_init_lock(&start_mutex, signal_name_prefix, pconf); exit_event = open_event(exit_event_name); } ap_assert(start_mutex); @@ -1623,7 +1623,7 @@ * Ths start mutex is used during a restart to prevent more than one * child process from entering the accept loop at once. */ - ap_create_lock(pconf,APR_MUTEX, APR_CROSS_PROCESS,signal_name_prefix,&start_mutex); + ap_create_lock(&start_mutex,APR_MUTEX, APR_CROSS_PROCESS,signal_name_prefix,pconf); /* TODO: Add some code to detect failure */ }