Browse Source

deps: fix openssl for MSVS 2015

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

This was ported to v0.10 in https://github.com/joyent/node/pull/25857

PR-URL: https://github.com/nodejs/node/pull/2843
Reviewed-By: rvagg - Rod Vagg <rod@vagg.org>
Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
v0.12-staging
Andy Polyakov 11 years ago
committed by João Reis
parent
commit
583734342e
  1. 4
      deps/openssl/openssl/e_os.h

4
deps/openssl/openssl/e_os.h

@ -315,7 +315,7 @@ static __inline unsigned int _strlen31(const char *str)
# undef isxdigit # undef isxdigit
# endif # endif
# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) # if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)
# if _MSC_VER>=1300 # if _MSC_VER>=1300 && _MSC_VER<1600
# undef stdin # undef stdin
# undef stdout # undef stdout
# undef stderr # undef stderr
@ -323,7 +323,7 @@ FILE *__iob_func();
# define stdin (&__iob_func()[0]) # define stdin (&__iob_func()[0])
# define stdout (&__iob_func()[1]) # define stdout (&__iob_func()[1])
# define stderr (&__iob_func()[2]) # 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 stdin
# undef stdout # undef stdout
# undef stderr # undef stderr

Loading…
Cancel
Save