diff options
| author | Ivan Zhakov <ivan@apache.org> | 2019-06-11 17:22:46 +0000 |
|---|---|---|
| committer | Ivan Zhakov <ivan@apache.org> | 2019-06-11 17:22:46 +0000 |
| commit | 55097274042fbd915e06712e0ba0d838e8a425cd (patch) | |
| tree | 061bd2183b9e6ba6b2b718bb1b94864980d3eaf5 /include/arch | |
| parent | 0a5329d816523a039a580387e74e59570c1193cc (diff) | |
| download | apr-55097274042fbd915e06712e0ba0d838e8a425cd.tar.gz | |
Fix problem that apr_get_oslevel() was returning APR_WIN_XP on Windows 10.
* include/arch/win32/apr_arch_misc.h
(enum apr_oslevel_e): Add APR_WIN_10.
* misc/win32/misc.c
(apr_get_oslevel): Return APR_WIN_10 when dwMajorVersion is greater than 6.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1861054 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/arch')
| -rw-r--r-- | include/arch/win32/apr_arch_misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/arch/win32/apr_arch_misc.h b/include/arch/win32/apr_arch_misc.h index cca245cae..431564c58 100644 --- a/include/arch/win32/apr_arch_misc.h +++ b/include/arch/win32/apr_arch_misc.h @@ -111,7 +111,8 @@ typedef enum { APR_WIN_VISTA = 80, APR_WIN_7 = 90, APR_WIN_8 = 100, - APR_WIN_8_1 = 110 + APR_WIN_8_1 = 110, + APR_WIN_10 = 120 } apr_oslevel_e; extern APR_DECLARE_DATA apr_oslevel_e apr_os_level; |