summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-09 14:06:36 +0000
committerMatt Caswell <matt@openssl.org>2015-01-13 09:48:38 +0000
commit23df532ec481886880c42bea035c7b872b7b5091 (patch)
treec8f05c55f57a33316661522fcf6e5b725ca5fc11 /e_os.h
parentb960060a0dbb73e95b0d13308f84a13438692fc2 (diff)
Avoid deprecation problems in Visual Studio 13
Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 86d21d0b9577322ac5da0114c5fac16eb49b4cef)
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/e_os.h b/e_os.h
index b66b895bf2..fc1782a2c9 100644
--- a/e_os.h
+++ b/e_os.h
@@ -371,11 +371,13 @@ static __inline unsigned int _strlen31(const char *str)
# define DEFAULT_HOME "C:"
# endif
-/* Avoid Windows 8 SDK GetVersion deprecated problems */
+/* Avoid Visual Studio 13 GetVersion deprecated problems */
#if defined(_MSC_VER) && _MSC_VER>=1800
# define check_winnt() (1)
+# define check_win_minplat(x) (1)
#else
# define check_winnt() (GetVersion() < 0x80000000)
+# define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
#endif
#else /* The non-microsoft world */