httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r556879 - /httpd/httpd/trunk/support/win32/ApacheMonitor.c
Date Tue, 17 Jul 2007 10:41:16 GMT
Author: mturk
Date: Tue Jul 17 03:41:08 2007
New Revision: 556879

URL: http://svn.apache.org/viewvc?view=rev&rev=556879
Log:
ApacheMonitor valid OS is any WIN32_NT version.

Modified:
    httpd/httpd/trunk/support/win32/ApacheMonitor.c

Modified: httpd/httpd/trunk/support/win32/ApacheMonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/win32/ApacheMonitor.c?view=diff&rev=556879&r1=556878&r2=556879
==============================================================================
--- httpd/httpd/trunk/support/win32/ApacheMonitor.c (original)
+++ httpd/httpd/trunk/support/win32/ApacheMonitor.c Tue Jul 17 03:41:08 2007
@@ -280,10 +280,7 @@
     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 @@
         else if (osvi.dwMajorVersion == 6) {
             *dwVersion = OS_VERSION_VISTA;
         }
-        else {
-            return FALSE;
-        }
+        else
+            *dwVersion = OS_VERSION_WINNT;            
         break;
 
     case VER_PLATFORM_WIN32_WINDOWS:



Mime
View raw message