summaryrefslogtreecommitdiffstats
path: root/e_os.h
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:34:02 +0200
commit61df34e924cfe93a05f0bc9488ce68b49ca1e5c5 (patch)
tree0da57c84a07caa7de5bd53081c122d71af0cb6d7 /e_os.h
parent47b9e06cfd3a4fa89a690309e5839ed57e93f0f8 (diff)
e_os.h: limit _MSC_VER trickery to older compilers.
PR: #3390 (cherry picked from commit aab3560b65b9254d17770bb6fe3ca7edd7451429)
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h4
1 files changed, 2 insertions, 2 deletions
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