From fdd27d85c5179d6aeb429b5087b9b8d249177956 Mon Sep 17 00:00:00 2001 From: Mladen Turk Date: Tue, 8 May 2007 04:45:54 +0000 Subject: [PATCH] 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 --- support/win32/ApacheMonitor.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c index 1ea839aefcc..fb97922b557 100644 --- 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; -- 2.47.2