generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e_os.h: limit _MSC_VER trickery to older compilers.

Browse Source 
PR: #3390, backport from 1.0.2.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Andy Polyakov 2015-12-03 12:29:49 +01:00
parent d585cc32a5
commit 005f4893dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e_os.h
View File

@ -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