X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=e_os.h;h=2076f7519678e0afc56a01eabd551b1af7d966c8;hb=fbe8ea3abea070f9da1fb48ef2f6e20fc829f829;hp=a1e77e7488c70666fe34c600c2c075ad04ffdbef;hpb=0f9bcf33197989bda47ccde4ad4fc1feb82dffbe;p=openssl.git

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