apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r494055 - in /apr/apr/trunk: include/arch/win32/apr_arch_misc.h misc/win32/misc.c
Date Mon, 08 Jan 2007 13:09:34 GMT
Author: mturk
Date: Mon Jan  8 05:09:33 2007
New Revision: 494055

URL: http://svn.apache.org/viewvc?view=rev&rev=494055
Log:
Add Windows Vista os version detection

Modified:
    apr/apr/trunk/include/arch/win32/apr_arch_misc.h
    apr/apr/trunk/misc/win32/misc.c

Modified: apr/apr/trunk/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?view=diff&rev=494055&r1=494054&r2=494055
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Mon Jan  8 05:09:33 2007
@@ -103,7 +103,8 @@
         APR_WIN_XP =       60,
         APR_WIN_XP_SP1 =   61,
         APR_WIN_XP_SP2 =   62,
-        APR_WIN_2003 =     70
+        APR_WIN_2003 =     70,
+        APR_WIN_VISTA =    80
 } apr_oslevel_e;
 
 extern APR_DECLARE_DATA apr_oslevel_e apr_os_level;

Modified: apr/apr/trunk/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/misc.c?view=diff&rev=494055&r1=494054&r2=494055
==============================================================================
--- apr/apr/trunk/misc/win32/misc.c (original)
+++ apr/apr/trunk/misc/win32/misc.c Mon Jan  8 05:09:33 2007
@@ -80,7 +80,7 @@
                         apr_os_level = APR_WIN_2000_SP2;
                 }
                 else if (oslev.dwMinorVersion == 2) {
-                    apr_os_level = APR_WIN_2003;                    
+                    apr_os_level = APR_WIN_2003;
                 }
                 else {
                     if (servpack < 1)
@@ -90,6 +90,9 @@
                     else
                         apr_os_level = APR_WIN_XP_SP2;
                 }
+            }
+            else if (oslev.dwMajorVersion == 6) {
+                apr_os_level = APR_WIN_VISTA;
             }
             else {
                 apr_os_level = APR_WIN_XP;



Mime
View raw message