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 /crypto/o_time.c | |
| 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)
Diffstat (limited to 'crypto/o_time.c')
| -rw-r--r-- | crypto/o_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |