[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_1-stable has been updated
       via  005f4893dc770d77eb07a098da32e0fca87f07b6 (commit)
      from  d585cc32a55e65573051225b29dc62171f59e05a (commit)


- Log -----------------------------------------------------------------
commit 005f4893dc770d77eb07a098da32e0fca87f07b6
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Dec 3 12:29:49 2015 +0100

    e_os.h: limit _MSC_VER trickery to older compilers.
    
    PR: #3390, backport from 1.0.2.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 e_os.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e_os.h b/e_os.h
index c9c7aaf..76c471e 100644
--- a/e_os.h
+++ b/e_os.h
@@ -315,7 +315,7 @@ 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
@@ -323,7 +323,7 @@ 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