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:09:24 +0200 |
| commit | e21519280b3c3e0b264632fd72ce503a9d9ced73 (patch) | |
| tree | ef0334565fe91d5b3d5f8a11347f8c268571c5ea /crypto/o_time.c | |
| parent | be4c4237ce26d1f484add07e6e34e2650c7b7102 (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)
(cherry picked from commit c35b8535768e22cd3b7743f4887a72e53a621a5f)
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 6d764f55e2..d990556d1e 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; |