summaryrefslogtreecommitdiff
path: root/support/win32/ApacheMonitor.c
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2011-12-27 19:42:13 +0100
committerStefan Fritsch <sf@sfritsch.de>2011-12-27 19:42:13 +0100
commit1acac7a6b494db24f8f58e44dab7657b6de68742 (patch)
tree9a0dd3753dd6fb8c859ed299ee9794b88173c420 /support/win32/ApacheMonitor.c
parent80ba9f34b69a273d82f2f46d7fe231e30e127028 (diff)
downloadapache2-1acac7a6b494db24f8f58e44dab7657b6de68742.tar.gz
Upstream tarball 2.2.6upstream/2.2.6
Diffstat (limited to 'support/win32/ApacheMonitor.c')
-rw-r--r--support/win32/ApacheMonitor.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 1ea839ae..128d9cc2 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -49,6 +49,7 @@
#define OS_VERSION_WIN9X 1
#define OS_VERSION_WINNT 2
#define OS_VERSION_WIN2K 3
+
/* Should be enough */
#define MAX_APACHE_SERVICES 128
#define MAX_APACHE_COMPUTERS 32
@@ -278,15 +279,10 @@ 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)
*dwVersion = OS_VERSION_WIN2K;
- }
- else {
- return FALSE;
- }
+ else
+ *dwVersion = OS_VERSION_WINNT;
break;
case VER_PLATFORM_WIN32_WINDOWS: