From 8b8a48d099e6ae985f80cbbdad566e2b8aaf96a3 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Fri, 9 Jan 2015 14:06:36 +0000
Subject: Avoid deprecation problems in Visual Studio 13

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 86d21d0b9577322ac5da0114c5fac16eb49b4cef)

Conflicts:
	e_os.h
---
 e_os.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'e_os.h')

diff --git a/e_os.h b/e_os.h
index c75858bf58..d8ac803c50 100644
--- a/e_os.h
+++ b/e_os.h
@@ -360,12 +360,14 @@ 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)
-#endif 
+#  define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
+#endif
 
 #else /* The non-microsoft world */
 
-- 
cgit v1.2.3