summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2013-10-21 12:42:47 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2013-10-21 12:42:47 +0000
commit1eb433c806780ac4567fb490ed682a524ef65552 (patch)
tree29f0b78e160435f96c4c028ed76273ca977a40c5 /misc
parentc34deac3fddaffbea7cb39aee6294535d4a6183c (diff)
downloadlibapr-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
Diffstat (limited to 'misc')
-rw-r--r--misc/win32/misc.c5
1 files changed, 4 insertions, 1 deletions
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;