Commit 5254baf8 authored by Mladen Turk's avatar Mladen Turk
Browse files

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
parent 14eb6d58

support/win32/ApacheMonitor.c

+9 −1
Original line number Diff line number Diff line
@@ -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,8 +284,14 @@ BOOL GetSystemOSVersion(LPDWORD dwVersion) 
            *dwVersion = OS_VERSION_WINNT;

        }

        else 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;

        }

        else {

            return FALSE;

        }