X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=e_os.h;h=9c5c6fdb92f27202cbd4381ea4b847f77212f7af;hb=c60dca1f95457a9cb6deca7a4c3f81f99fe05b11;hp=acc6a15eb7c753885972f1b48c2812e797a99248;hpb=3b0e61a812cef6bd45ace87b92e152f97a98bece;p=oweals%2Fopenssl.git diff --git a/e_os.h b/e_os.h index acc6a15eb7..9c5c6fdb92 100644 --- a/e_os.h +++ b/e_os.h @@ -269,6 +269,7 @@ extern "C" { # define _WIN32_WINNT 0x0400 # endif # include +# include # include # include # include @@ -284,13 +285,38 @@ static unsigned int _strlen31(const char *str) # endif # include # if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace) - /* compensate for bug is VC6 ctype.h */ + /* compensate for bug in VC6 ctype.h */ # undef isspace # undef isdigit # undef isalnum # undef isupper # undef isxdigit # endif +# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) +# if _MSC_VER>=1300 +# undef stdin +# undef stdout +# undef stderr + 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) +# undef stdin +# undef stdout +# undef stderr + /* pre-1300 has __p__iob(), but it's available only in msvcrt.lib, + * or in other words with /MD. Declaring implicit import, i.e. + * with _imp_ prefix, works correctly with all compiler options, + * but without /MD results in LINK warning LNK4049: + * 'locally defined symbol "__iob" imported'. + */ + extern FILE *_imp___iob; +# define stdin (&_imp___iob[0]) +# define stdout (&_imp___iob[1]) +# define stderr (&_imp___iob[2]) +# endif +# endif # endif # include # include