apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1534134 - in /apr/apr/branches/1.5.x: ./ include/arch/win32/apr_arch_misc.h misc/win32/misc.c
Date Mon, 21 Oct 2013 12:42:47 GMT
Author: trawick
Date: Mon Oct 21 12:42:47 2013
New Revision: 1534134

URL: http://svn.apache.org/r1534134
Log:
Merge r989450 from trunk:

Add Windows 7 to the list of detected versions

Submitted by: mturk

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/include/arch/win32/apr_arch_misc.h
    apr/apr/branches/1.5.x/misc/win32/misc.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r989450

Modified: apr/apr/branches/1.5.x/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/arch/win32/apr_arch_misc.h?rev=1534134&r1=1534133&r2=1534134&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/branches/1.5.x/include/arch/win32/apr_arch_misc.h Mon Oct 21 12:42:47 2013
@@ -105,7 +105,8 @@ typedef enum {
     APR_WIN_XP_SP1 =   61,
     APR_WIN_XP_SP2 =   62,
     APR_WIN_2003 =     70,
-    APR_WIN_VISTA =    80
+    APR_WIN_VISTA =    80,
+    APR_WIN_7 =        90
 } apr_oslevel_e;
 
 extern APR_DECLARE_DATA apr_oslevel_e apr_os_level;

Modified: apr/apr/branches/1.5.x/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/misc/win32/misc.c?rev=1534134&r1=1534133&r2=1534134&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/misc/win32/misc.c (original)
+++ apr/apr/branches/1.5.x/misc/win32/misc.c Mon Oct 21 12:42:47 2013
@@ -97,7 +97,10 @@ apr_status_t apr_get_oslevel(apr_oslevel
                 }
             }
             else if (oslev.dwMajorVersion == 6) {
-                apr_os_level = APR_WIN_VISTA;
+                if (oslev.dwMinorVersion == 0)
+                    apr_os_level = APR_WIN_VISTA;
+                else
+                    apr_os_level = APR_WIN_7;
             }
             else {
                 apr_os_level = APR_WIN_XP;



Mime
View raw message