From: Andy Polyakov <appro@openssl.org>
Date: Wed, 2 Jul 2014 20:30:54 +0000 (+0200)
Subject: e_os.h: limit _MSC_VER trickery to older compilers.
X-Git-Tag: OpenSSL_1_0_2-beta2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61df34e924cfe93a05f0bc9488ce68b49ca1e5c5;p=openssl

e_os.h: limit _MSC_VER trickery to older compilers.

PR: #3390
(cherry picked from commit aab3560b65b9254d17770bb6fe3ca7edd7451429)
---

diff --git a/e_os.h b/e_os.h
index a1e77e7488..2076f75196 100644
--- a/e_os.h
+++ b/e_os.h
@@ -310,7 +310,7 @@ static unsigned int _strlen31(const char *str)
 #      undef isxdigit
 #    endif
 #    if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
-#      if _MSC_VER>=1300
+#      if _MSC_VER>=1300 && _MSC_VER<1600
 #        undef stdin
 #        undef stdout
 #        undef stderr
@@ -318,7 +318,7 @@ static unsigned int _strlen31(const char *str)
 #        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