From: Mladen Turk <mturk@apache.org>
Date: Tue, 17 Jul 2007 10:41:08 +0000 (+0000)
Subject: ApacheMonitor valid OS is any WIN32_NT version.
X-Git-Tag: 2.3.0~1716
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9438a393977f8c8191f2a8b46c1762c35065dec;p=thirdparty%2Fapache%2Fhttpd.git

ApacheMonitor valid OS is any WIN32_NT version.

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

diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index fb97922b557..54e936f2414 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -280,10 +280,7 @@ BOOL GetSystemOSVersion(LPDWORD dwVersion)
     switch (osvi.dwPlatformId)
     {
     case VER_PLATFORM_WIN32_NT:
-        if (osvi.dwMajorVersion <= 4) {
-            *dwVersion = OS_VERSION_WINNT;
-        }
-        else if (osvi.dwMajorVersion == 5) {
+        if (osvi.dwMajorVersion == 5) {
             if (osvi.dwMinorVersion == 1)
                 *dwVersion = OS_VERSION_WINXP;
             else
@@ -292,9 +289,8 @@ BOOL GetSystemOSVersion(LPDWORD dwVersion)
         else if (osvi.dwMajorVersion == 6) {
             *dwVersion = OS_VERSION_VISTA;
         }
-        else {
-            return FALSE;
-        }
+        else
+            *dwVersion = OS_VERSION_WINNT;            
         break;
 
     case VER_PLATFORM_WIN32_WINDOWS: