diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 23:56:06 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 23:56:06 -0300 |
| commit | 33aa019e4f00b3ac9809c7974c1d660b2f65455f (patch) | |
| tree | dc92703dce55d6d4b3d627ddbc3a3dfae924c5c9 /drivers/builtin_openssl2/e_os.h | |
| parent | 3118c192bdfcecaa6b08050f99d0813f5ec93882 (diff) | |
| parent | fff7cedbe18e0ebf4bd22f05d2b068d6cd85b739 (diff) | |
Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation
Visual studio 2015 compilation
Diffstat (limited to 'drivers/builtin_openssl2/e_os.h')
| -rw-r--r-- | drivers/builtin_openssl2/e_os.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/builtin_openssl2/e_os.h b/drivers/builtin_openssl2/e_os.h index e801b4106a..7323a7b4bf 100644 --- a/drivers/builtin_openssl2/e_os.h +++ b/drivers/builtin_openssl2/e_os.h @@ -318,8 +318,8 @@ static unsigned int _strlen31(const char *str) # undef isupper # undef isxdigit # endif -# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) -# if _MSC_VER>=1300 +# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin) +# if _MSC_VER>=1300 && _MSC_VER<1600 # undef stdin # undef stdout # undef stderr @@ -327,7 +327,7 @@ static unsigned int _strlen31(const char *str) # 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 |