From: Andy Polyakov <appro@openssl.org>
Date: Thu, 3 Dec 2015 11:29:49 +0000 (+0100)
Subject: e_os.h: limit _MSC_VER trickery to older compilers.
X-Git-Tag: OpenSSL_1_0_1q~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=005f4893dc770d77eb07a098da32e0fca87f07b6;p=oweals%2Fopenssl.git

e_os.h: limit _MSC_VER trickery to older compilers.

PR: #3390, backport from 1.0.2.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/e_os.h b/e_os.h
index c9c7aaf1a7..76c471e370 100644
--- a/e_os.h
+++ b/e_os.h
@@ -315,7 +315,7 @@ static __inline unsigned int _strlen31(const char *str)
 #    undef isxdigit
 #   endif
 #   if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)
-#    if _MSC_VER>=1300
+#    if _MSC_VER>=1300 && _MSC_VER<1600
 #     undef stdin
 #     undef stdout
 #     undef stderr
@@ -323,7 +323,7 @@ FILE *__iob_func();
 #     define stdin  (&__iob_func()[0])
 #     define stdout (&__iob_func()[1])
 #     define stderr (&__iob_func()[2])
-#    elif defined(I_CAN_LIVE_WITH_LNK4049)
+#    elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049)
 #     undef stdin
 #     undef stdout
 #     undef stderr