Add detection for post XP operating systems.

Think this can be safely backported to 2.2 and 2.0 branches

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

diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 1ea839aefccea12c696852f0135520adb1fb9b76..fb97922b5574a05209ec4b4cb6e662a21fc7a72e 100644 (file)
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -49,6 +49,8 @@
 #define OS_VERSION_WIN9X    1
 #define OS_VERSION_WINNT    2
 #define OS_VERSION_WIN2K    3
+#define OS_VERSION_WINXP    4
+#define OS_VERSION_VISTA    5
 /* Should be enough */
 #define MAX_APACHE_SERVICES 128
 #define MAX_APACHE_COMPUTERS 32
@@ -282,7 +284,13 @@ BOOL GetSystemOSVersion(LPDWORD dwVersion)
             *dwVersion = OS_VERSION_WINNT;
         }
         else if (osvi.dwMajorVersion == 5) {
-            *dwVersion = OS_VERSION_WIN2K;
+            if (osvi.dwMinorVersion == 1)
+                *dwVersion = OS_VERSION_WINXP;
+            else
+                *dwVersion = OS_VERSION_WIN2K;
+        }
+        else if (osvi.dwMajorVersion == 6) {
+            *dwVersion = OS_VERSION_VISTA;
         }
         else {
             return FALSE;