diff options
| author | aSoujyuTanaka <soujyu.tanaka@access-company.com> | 2020-04-12 04:10:57 +0900 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-07-15 23:03:22 +0200 |
| commit | c35b8535768e22cd3b7743f4887a72e53a621a5f (patch) | |
| tree | e1c7c98e196ea7c071dbc062e08d9aee898d2319 | |
| parent | a1736f37aee855fecf463b9f15519e12c333ecfc (diff) | |
Enable WinCE build without deceiving _MSC_VER.
Reviewed-by: Mark J. Cox <mark@awe.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11526)
| -rw-r--r-- | crypto/o_str.c | 2 | ||||
| -rw-r--r-- | crypto/o_time.c | 2 | ||||
| -rw-r--r-- | crypto/rand/randfile.c | 2 | ||||
| -rw-r--r-- | e_os.h | 2 | ||||
| -rw-r--r-- | include/openssl/e_os2.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/crypto/o_str.c b/crypto/o_str.c index 8aa1a2a4dd..cfc401427d 100644 --- a/crypto/o_str.c +++ b/crypto/o_str.c @@ -287,7 +287,7 @@ char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen) int openssl_strerror_r(int errnum, char *buf, size_t buflen) { -#if defined(_MSC_VER) && _MSC_VER>=1400 +#if defined(_MSC_VER) && _MSC_VER>=1400 && !defined(_WIN32_WCE) return !strerror_s(buf, buflen, errnum); #elif defined(_GNU_SOURCE) char *err; diff --git a/crypto/o_time.c b/crypto/o_time.c index f0e3e472e0..695f5c2938 100644 --- a/crypto/o_time.c +++ b/crypto/o_time.c @@ -41,7 +41,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result) if (gmtime_r(timer, result) == NULL) return NULL; ts = result; -#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400 +#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_WIN32_WCE) if (gmtime_s(result, timer)) return NULL; ts = result; diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 7dde54b187..cbc2720918 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -26,7 +26,7 @@ #ifndef OPENSSL_NO_POSIX_IO # include <sys/stat.h> # include <fcntl.h> -# ifdef _WIN32 +# if defined(_WIN32) && !defined(_WIN32_WCE) # include <windows.h> # include <io.h> # define stat _stat @@ -258,7 +258,7 @@ extern FILE *_imp___iob; # if defined(OPENSSL_SYS_WINDOWS) # define strcasecmp _stricmp # define strncasecmp _strnicmp -# if (_MSC_VER >= 1310) +# if (_MSC_VER >= 1310) && !defined(_WIN32_WCE) # define open _open # define fdopen _fdopen # define close _close diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index 982dd2b8a7..aab4ef38a7 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -220,7 +220,7 @@ typedef UINT64 uint64_t; # undef OPENSSL_NO_INTTYPES_H /* Because the specs say that inttypes.h includes stdint.h if present */ # undef OPENSSL_NO_STDINT_H -# elif defined(_MSC_VER) && _MSC_VER<=1500 +# elif defined(_MSC_VER) && _MSC_VER<1600 /* * minimally required typdefs for systems not supporting inttypes.h or * stdint.h: currently just older VC++ |