diff options
author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-10-21 12:42:47 +0000 |
---|---|---|
committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-10-21 12:42:47 +0000 |
commit | 1eb433c806780ac4567fb490ed682a524ef65552 (patch) | |
tree | 29f0b78e160435f96c4c028ed76273ca977a40c5 | |
parent | c34deac3fddaffbea7cb39aee6294535d4a6183c (diff) | |
download | libapr-1eb433c806780ac4567fb490ed682a524ef65552.tar.gz |
Merge r989450 from trunk:
Add Windows 7 to the list of detected versions
Submitted by: mturk
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1534134 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | include/arch/win32/apr_arch_misc.h | 3 | ||||
-rw-r--r-- | misc/win32/misc.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/arch/win32/apr_arch_misc.h b/include/arch/win32/apr_arch_misc.h index ed05bcd28..ba4935664 100644 --- a/include/arch/win32/apr_arch_misc.h +++ b/include/arch/win32/apr_arch_misc.h @@ -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; diff --git a/misc/win32/misc.c b/misc/win32/misc.c index 3f1252443..3591f63c6 100644 --- a/misc/win32/misc.c +++ b/misc/win32/misc.c @@ -97,7 +97,10 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *level) } } 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; |