You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mt...@apache.org on 2010/08/26 08:10:54 UTC
svn commit: r989450 - in /apr/apr/trunk: include/arch/win32/apr_arch_misc.h
misc/win32/misc.c
Author: mturk
Date: Thu Aug 26 06:10:54 2010
New Revision: 989450
URL: http://svn.apache.org/viewvc?rev=989450&view=rev
Log:
Add Windows 7 to the list of detected versions
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=989450&r1=989449&r2=989450&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Thu Aug 26 06:10:54 2010
@@ -104,7 +104,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/trunk/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/misc.c?rev=989450&r1=989449&r2=989450&view=diff
==============================================================================
--- apr/apr/trunk/misc/win32/misc.c (original)
+++ apr/apr/trunk/misc/win32/misc.c Thu Aug 26 06:10:54 2010
@@ -98,7 +98,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;