Axe a completely bogus internal helper function.

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

diff --git a/os/win32/os.h b/os/win32/os.h
index 9a386847d4f72bca51ff46d300249d0182126c73..ea5a9e74c534bad933ea64d41dd06107490eb484 100644 (file)
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -89,9 +89,6 @@ FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal);
 PSECURITY_ATTRIBUTES GetNullACL();
 void CleanNullACL(void *sa);
 
-DWORD wait_for_many_objects(DWORD nCount, CONST HANDLE *lpHandles, 
-                            DWORD dwSeconds);
-
 int set_listeners_noninheritable(apr_pool_t *p);
 
 

diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index 4113602d89f46eee6fbe72d94b6b686c3760d278..ab96ff113675c17398284550a12762ee81dea97d 100644 (file)
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -145,53 +145,3 @@ void CleanNullACL(void *sa)
         LocalFree(sa);
     }
 }
-
-
-/*
- * The Win32 call WaitForMultipleObjects will only allow you to wait for
- * a maximum of MAXIMUM_WAIT_OBJECTS (current 64).  Since the threading
- * model in the multithreaded version of apache wants to use this call,
- * we are restricted to a maximum of 64 threads.  This is a simplistic
- * routine that will increase this size.
- */
-DWORD wait_for_many_objects(DWORD nCount, CONST HANDLE *lpHandles,
-                            DWORD dwSeconds)
-{
-    DWORD dwStopTime;
-    DWORD dwRet = WAIT_FAILED;
-    DWORD dwIndex = 0;
-    BOOL bFirst = TRUE;
-
-    dwStopTime = GetTickCount() + dwSeconds * 1000;
-
-    do {
-        if (!bFirst)
-            Sleep(1000);
-        else
-            bFirst = FALSE;
-
-        for (dwIndex = 0; dwIndex * MAXIMUM_WAIT_OBJECTS < nCount; dwIndex++) {
-            dwRet = WaitForMultipleObjects(
-                min(MAXIMUM_WAIT_OBJECTS, nCount - (dwIndex * MAXIMUM_WAIT_OBJECTS)),
-                lpHandles + (dwIndex * MAXIMUM_WAIT_OBJECTS),
-                0, 0);
-            if (dwRet == WAIT_FAILED) {
-                return dwRet;
-            }
-            if (dwRet != WAIT_TIMEOUT) {
-                if (dwRet >= WAIT_ABANDONED_0) {
-                    /* We just got the ownership of the object.
-                     * It does not mean that the object is signaled.
-                     */
-                }
-                else {
-                    dwRet = dwRet - WAIT_OBJECT_0 + (dwIndex * MAXIMUM_WAIT_OBJECTS);
-                    break;
-                }
-            }
-            dwRet = WAIT_FAILED;
-        }
-    } while((GetTickCount() < dwStopTime) && (dwRet == WAIT_FAILED));
-
-    return dwRet;
-}