summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2014-07-02 22:30:54 +0200
committerAndy Polyakov <appro@openssl.org>2014-07-02 22:30:54 +0200
commitaab3560b65b9254d17770bb6fe3ca7edd7451429 (patch)
treef0db9a9c12cf9161a9c3098825222aba2c25a970
parenteca441b2b4d33d2a18d163ef9b4b3aff14251c73 (diff)
downloadopenssl-new-aab3560b65b9254d17770bb6fe3ca7edd7451429.tar.gz
e_os.h: limit _MSC_VER trickery to older compilers.
PR: #3390
-rw-r--r--e_os.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/e_os.h b/e_os.h
index 67638f7534..0a97895360 100644
--- a/e_os.h
+++ b/e_os.h
@@ -311,7 +311,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
@@ -319,7 +319,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