From: Jon Spillett <jon.spillett@oracle.com>
Date: Wed, 19 Apr 2017 06:21:29 +0000 (+1000)
Subject: Change 64-bit time type for windows
X-Git-Tag: OpenSSL_1_1_1-pre1~1731
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=424aa352458486d67e1e9cd3d3990dc06a60ba4a

Change 64-bit time type for windows

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3248)
---

diff --git a/fuzz/client.c b/fuzz/client.c
index 622d782b2c..92ec6c004d 100644
--- a/fuzz/client.c
+++ b/fuzz/client.c
@@ -37,7 +37,7 @@ static int idx;
  * coverage.
  */
 #if defined(_WIN32) && defined(_TIME64_T_DEFINED)
-time64_t _time64(time64_t *t) TIME_IMPL(t)
+__time64_t _time64(__time64_t *t) TIME_IMPL(t)
 #endif
 #if !defined(_WIN32) || !defined(_MSC_VER)
 time_t time(time_t *t) TIME_IMPL(t)
diff --git a/fuzz/server.c b/fuzz/server.c
index 1a6dd2cdfd..93cdc68d3f 100644
--- a/fuzz/server.c
+++ b/fuzz/server.c
@@ -484,7 +484,7 @@ static int idx;
  * coverage.
  */
 #if defined(_WIN32) && defined(_TIME64_T_DEFINED)
-time64_t _time64(time64_t *t) TIME_IMPL(t)
+__time64_t _time64(__time64_t *t) TIME_IMPL(t)
 #endif
 #if !defined(_WIN32) || !defined(_MSC_VER)
 time_t time(time_t *t) TIME_IMPL(t)