apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1861061 - in /apr/apr/trunk: include/arch/win32/apr_arch_misc.h misc/win32/misc.c
Date Tue, 11 Jun 2019 17:59:16 GMT
Author: ivan
Date: Tue Jun 11 17:59:16 2019
New Revision: 1861061

URL: http://svn.apache.org/viewvc?rev=1861061&view=rev
Log:
* include/arch/win32/apr_arch_misc.h
  (enum apr_oslevel_e): Add APR_WIN_7_SP1.

* misc/win32/misc.c
  (apr_get_oslevel): Determine whether we are running on Windows 7 or on
   Windows 7 SP1.

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?rev=1861061&r1=1861060&r2=1861061&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Tue Jun 11 17:59:16 2019
@@ -110,6 +110,7 @@ typedef enum {
         APR_WIN_2003 =     70,
         APR_WIN_VISTA =    80,
         APR_WIN_7  =       90,
+        APR_WIN_7_SP1 =    91,
         APR_WIN_8  =       100,
         APR_WIN_8_1 =      110,
         APR_WIN_10 =       120

Modified: apr/apr/trunk/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/misc.c?rev=1861061&r1=1861060&r2=1861061&view=diff
==============================================================================
--- apr/apr/trunk/misc/win32/misc.c (original)
+++ apr/apr/trunk/misc/win32/misc.c Tue Jun 11 17:59:16 2019
@@ -89,8 +89,12 @@ apr_status_t apr_get_oslevel(apr_oslevel
             else if (oslev.dwMajorVersion == 6) {
                 if (oslev.dwMinorVersion == 0)
                     apr_os_level = APR_WIN_VISTA;
-                else if (oslev.dwMinorVersion == 1)
-                    apr_os_level = APR_WIN_7;
+                else if (oslev.dwMinorVersion == 1) {
+                    if (servpack < 1)
+                        apr_os_level = APR_WIN_7;
+                    else
+                        apr_os_level = APR_WIN_7_SP1;
+                }
                 else if (oslev.dwMinorVersion == 2)
                     apr_os_level = APR_WIN_8;
                 else



Mime
View raw message