diff options
| author | Mladen Turk <mturk@apache.org> | 2007-07-18 08:02:21 +0000 |
|---|---|---|
| committer | Mladen Turk <mturk@apache.org> | 2007-07-18 08:02:21 +0000 |
| commit | 08355e91d3dd607f6c76e8bfaeed65434e3b846b (patch) | |
| tree | d704a548e95777c34334f2a8de98eff3a76e2c7d /support/win32 | |
| parent | 11314ae6124fcf86f7a4273e9f917e599608c1f4 (diff) | |
| download | httpd-08355e91d3dd607f6c76e8bfaeed65434e3b846b.tar.gz | |
Simplify OS detection. We are only interested in NT
and WIN2K+ (so we can use services.msc)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/win32')
| -rw-r--r-- | support/win32/ApacheMonitor.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c index 54e936f241..128d9cc287 100644 --- a/support/win32/ApacheMonitor.c +++ b/support/win32/ApacheMonitor.c @@ -49,8 +49,7 @@ #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 @@ -280,15 +279,8 @@ BOOL GetSystemOSVersion(LPDWORD dwVersion) switch (osvi.dwPlatformId) { case VER_PLATFORM_WIN32_NT: - if (osvi.dwMajorVersion == 5) { - if (osvi.dwMinorVersion == 1) - *dwVersion = OS_VERSION_WINXP; - else - *dwVersion = OS_VERSION_WIN2K; - } - else if (osvi.dwMajorVersion == 6) { - *dwVersion = OS_VERSION_VISTA; - } + if (osvi.dwMajorVersion >= 5) + *dwVersion = OS_VERSION_WIN2K; else *dwVersion = OS_VERSION_WINNT; break; |