Do a bit of Win32 specific garbage collecting. Most of os.h (of not all

of it) should go away eventually, merged into APR. Seems useful to delete
the obvious garbage first.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84832 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/os/win32/os.h b/os/win32/os.h
index abd98ae8a8b9f0b5d1ae7fad3b5a3d2fc10d86a7..e826c080142411d098b7025a2fe729d53b7c299e 100644 (file)
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -139,11 +139,6 @@ every configuration function as __stdcall.
 #define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
 #endif
 
-#if 0
-#ifndef S_ISREG
-#define S_ISREG(m)      (((m)&(S_IFREG)) == (S_IFREG))
-#endif
-#endif
 
 #define STDIN_FILENO  0
 #define STDOUT_FILENO 1
@@ -163,13 +158,6 @@ __inline int ap_os_is_path_absolute(const char *file)
   return file[0] == '/' || file[1] == ':';
 }
 
-#define _spawnv(mode,cmdname,argv)         os_spawnv(mode,cmdname,argv)
-#define spawnv(mode,cmdname,argv)          os_spawnv(mode,cmdname,argv)
-#define _spawnve(mode,cmdname,argv,envp)    os_spawnve(mode,cmdname,argv,envp)
-#define spawnve(mode,cmdname,argv,envp)            os_spawnve(mode,cmdname,argv,envp)
-#define _spawnle                           os_spawnle
-#define spawnle                                    os_spawnle
-
 /* OS-dependent filename routines in util_win32.c */
 API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *p, const char *file);
 API_EXPORT(char *) ap_os_case_canonical_filename(ap_context_t *pPool, const char *szFile);
@@ -179,7 +167,9 @@ int os_strftime(char *, size_t , const char *, const struct tm *);
 
 /* Abstractions for dealing with shared object files (DLLs on Win32).
  * These are used by mod_so.c
+ * ToDo: This need to be migrated to APR
  */
+
 #define ap_os_dso_handle_t  HINSTANCE
 #define ap_os_dso_init()
 #define ap_os_dso_load(l)   LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)
@@ -190,19 +180,8 @@ int os_strftime(char *, size_t , const char *, const struct tm *);
 /* Other ap_os_ routines not used by this platform */
 #define ap_os_kill(pid, sig)                kill(pid, sig)
 
-/* Moved from multithread.h. Axe this stuff when APR comes online... */
-
-#define MULTI_OK (0)
-#define MULTI_TIMEOUT (1)
-#define MULTI_ERR (2)
-
 typedef void thread;
 typedef void event;
 
-thread *create_thread(void (thread_fn) (void *thread_arg), void *thread_arg);
-int kill_thread(thread *thread_id);
-int await_thread(thread *thread_id, int sec_to_wait);
-void exit_thread(int status);
-void free_thread(thread *thread_id);
 
 #endif   /* ! APACHE_OS_H */

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index f60b690bc79ac7d6868da8b3a95dd46ece9bc603..229352cc1fab2955d49973b7bafbb00c62d48952 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -118,25 +118,6 @@ static ap_status_t socket_cleanup(void *sock)
  * or thrown out entirely...
  */
 
-static int
-map_rv(int rv)
-{
-    switch(rv)
-    {
-    case WAIT_OBJECT_0:
-    case WAIT_ABANDONED:
-        return(MULTI_OK);
-    case WAIT_TIMEOUT:
-        return(MULTI_TIMEOUT);
-    case WAIT_FAILED:
-        return(MULTI_ERR);
-    default:
-        ap_assert(0);
-    }
-
-    ap_assert(0);
-    return(0);
-}
 
 typedef void semaphore;
 typedef void event;
@@ -147,13 +128,13 @@ create_semaphore(int initial)
     return(CreateSemaphore(NULL, initial, 1000000, NULL));
 }
 
-static int acquire_semaphore(semaphore *semaphore_id)
+static void acquire_semaphore(semaphore *semaphore_id)
 {
     int rv;
     
     rv = WaitForSingleObject(semaphore_id, INFINITE);
     
-    return(map_rv(rv));
+    return;
 }
 
 static int release_semaphore(semaphore *semaphore_id)