summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-02-25 12:11:22 +0000
committerDr. Stephen Henson <steve@openssl.org>2014-02-25 13:41:53 +0000
commit0f9bcf33197989bda47ccde4ad4fc1feb82dffbe (patch)
tree4f602ac90e4af54f2728a9bdcb7b2952bcb80ce2 /e_os.h
parenta948732e1c9ffdc92cb9f7b201966aba89dd4d20 (diff)
Avoid Windows 8 Getversion deprecated errors.
Windows 8 SDKs complain that GetVersion() is deprecated. We only use GetVersion like this: (GetVersion() < 0x80000000) which checks if the Windows version is NT based. Use a macro check_winnt() which uses GetVersion() on older SDK versions and true otherwise. (cherry picked from commit a4cc3c8041104896d51ae12ef7b678c31808ce52)
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/e_os.h b/e_os.h
index 3688c4e0f9..a1e77e7488 100644
--- a/e_os.h
+++ b/e_os.h
@@ -371,6 +371,13 @@ static unsigned int _strlen31(const char *str)
# define DEFAULT_HOME "C:"
# endif
+/* Avoid Windows 8 SDK GetVersion deprecated problems */
+#if defined(_MSC_VER) && _MSC_VER>=1800
+# define check_winnt() (1)
+#else
+# define check_winnt() (GetVersion() < 0x80000000)
+#endif
+
#else /* The non-microsoft world */
# ifdef OPENSSL_SYS_VMS