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

diff --git a/os/win32/os.h b/os/win32/os.h
index da3a167c9bc1e41961ea11326ef12d358fb56cc3..0df60c81ca8c54ff85b4433e1ac9c27709126059 100644 (file)
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -129,8 +129,4 @@ AP_DECLARE(char *) ap_os_canonical_filename(apr_pool_t *p, const char *file);
 AP_DECLARE(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile);
 AP_DECLARE(char *) ap_os_systemcase_filename(apr_pool_t *pPool, const char *szFile);
 
-typedef void thread;
-typedef void event;
-
-
 #endif   /* ! APACHE_OS_H */

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index f1e278200720a476319ff2afdd388d6b366c654c..5b932ba97b84be20402d29af59e2ff58a8e428f4 100644 (file)
--- 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;