deps: fix openssl for MSVS 2015

Andy Polyakov · joaocgreis · commit 7cf0d9c1d9ac · 2015-08-24T15:46:41.000-04:00
Backports http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=aab3560b65b9254d17770bb6fe3ca7edd7451429 from openssl upstream, to add support for Visual Studio 2015. This is already included in the newer openssl 1.0.2. Original commit message: e_os.h: limit _MSC_VER trickery to older compilers. PR: #3390 Original pull request: http://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=3390 PR-URL: #25857 Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
diff --git a/deps/openssl/openssl/e_os.h b/deps/openssl/openssl/e_os.h
@@ -315,15 +315,15 @@ 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
 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
