summaryrefslogtreecommitdiffstats
path: root/server/mpm/winnt/mpm_winnt.c
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2000-11-29 02:50:02 +0100
committerWilliam A. Rowe Jr <wrowe@apache.org>2000-11-29 02:50:02 +0100
commitc0aa89548fb63e62f0ac47a26fd486e7cb7291c0 (patch)
tree82793954e55c6ae3991cb8692cf76f661605999c /server/mpm/winnt/mpm_winnt.c
parent The only win32 project file that used (but didn't really use) os/win32/pass... (diff)
downloadapache2-c0aa89548fb63e62f0ac47a26fd486e7cb7291c0.tar.xz
apache2-c0aa89548fb63e62f0ac47a26fd486e7cb7291c0.zip
clean up some really bad typedefs - and move one into mpm_winnt.c since
that's the only module remaining that needs it. Should be an apr type, but we aren't using the apr accessors to handle them. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87115 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--server/mpm/winnt/mpm_winnt.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index f1e2782007..5b932ba97b 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -73,6 +73,8 @@
#include "mpm_winnt.h"
#include "mpm_common.h"
+typedef HANDLE thread;
+
/*
* Definitions of WINNT MPM specific config globals
*/
@@ -111,8 +113,8 @@ OSVERSIONINFO osver; /* VER_PLATFORM_WIN32_NT */
int ap_max_requests_per_child=0;
int ap_daemons_to_start=0;
-static event *exit_event;
-HANDLE maintenance_event;
+static HANDLE exit_event;
+static HANDLE maintenance_event;
apr_lock_t *start_mutex;
DWORD my_pid;
DWORD parent_pid;
@@ -155,16 +157,12 @@ static apr_status_t socket_cleanup(void *sock)
* or thrown out entirely...
*/
-typedef void semaphore;
-typedef void event;
-
-static semaphore *
-create_semaphore(int initial)
+static HANDLE create_semaphore(int initial)
{
return(CreateSemaphore(NULL, initial, 1000000, NULL));
}
-static void acquire_semaphore(semaphore *semaphore_id)
+static void acquire_semaphore(HANDLE semaphore_id)
{
int rv;
@@ -173,12 +171,12 @@ static void acquire_semaphore(semaphore *semaphore_id)
return;
}
-static int release_semaphore(semaphore *semaphore_id)
+static int release_semaphore(HANDLE semaphore_id)
{
return(ReleaseSemaphore(semaphore_id, 1, NULL));
}
-static void destroy_semaphore(semaphore *semaphore_id)
+static void destroy_semaphore(HANDLE semaphore_id)
{
CloseHandle(semaphore_id);
}
@@ -599,7 +597,7 @@ typedef struct joblist_s {
*/
typedef struct globals_s {
- semaphore *jobsemaphore;
+ HANDLE jobsemaphore;
joblist *jobhead;
joblist *jobtail;
apr_lock_t *jobmutex;