Skip to content

Commit 7cf0d9c

Browse files
Andy Polyakovjoaocgreis
Andy Polyakov
authored andcommitted
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: nodejs#3390 Original pull request: http://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=3390 PR-URL: nodejs/node-v0.x-archive#25857 Reviewed-By: Alexis Campailla <[email protected]>
1 parent 9ee8a14 commit 7cf0d9c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

deps/openssl/openssl/e_os.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,15 @@ static __inline unsigned int _strlen31(const char *str)
315315
# undef isxdigit
316316
# endif
317317
# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)
318-
# if _MSC_VER>=1300
318+
# if _MSC_VER>=1300 && _MSC_VER<1600
319319
# undef stdin
320320
# undef stdout
321321
# undef stderr
322322
FILE *__iob_func();
323323
# define stdin (&__iob_func()[0])
324324
# define stdout (&__iob_func()[1])
325325
# define stderr (&__iob_func()[2])
326-
# elif defined(I_CAN_LIVE_WITH_LNK4049)
326+
# elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049)
327327
# undef stdin
328328
# undef stdout
329329
# undef stderr

0 commit comments

Comments
 (0)