diff options
| author | Ivan Zhakov <ivan@apache.org> | 2019-06-11 17:59:16 +0000 |
|---|---|---|
| committer | Ivan Zhakov <ivan@apache.org> | 2019-06-11 17:59:16 +0000 |
| commit | 825b67fc5704ce8ceaed73a63b0778d3c7e96bc6 (patch) | |
| tree | 37c5b3bba2e96d872eb39cd42232c3540f569af9 /misc | |
| parent | 55097274042fbd915e06712e0ba0d838e8a425cd (diff) | |
| download | apr-825b67fc5704ce8ceaed73a63b0778d3c7e96bc6.tar.gz | |
* 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.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1861061 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/win32/misc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/misc/win32/misc.c b/misc/win32/misc.c index 20e99eddc..910b0b41e 100644 --- a/misc/win32/misc.c +++ b/misc/win32/misc.c @@ -89,8 +89,12 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *level) 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 |