diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-07-02 22:30:54 +0200 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2015-09-16 06:30:20 -0400 |
| commit | 583734342e543730c2f32863f538980eb81d3c85 (patch) | |
| tree | 4e43ba2d3e5423d2fefb79842612de0fcdae30a1 | |
| parent | 02c262a4c6c0281005076394ee7fea95d06b8a6e (diff) | |
| download | node-583734342e543730c2f32863f538980eb81d3c85.tar.gz | |
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>
| -rw-r--r-- | deps/openssl/openssl/e_os.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/openssl/openssl/e_os.h b/deps/openssl/openssl/e_os.h index 758448596..6d42f07ed 100644 --- a/deps/openssl/openssl/e_os.h +++ b/deps/openssl/openssl/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 |