The branch master has been updated
via 424aa352458486d67e1e9cd3d3990dc06a60ba4a (commit)
from d1186c30a265aedecb1b497c220b4cb7c2a7f4ec (commit)
- Log -----------------------------------------------------------------
commit 424aa352458486d67e1e9cd3d3990dc06a60ba4a
Author: Jon Spillett <[email protected]>
Date: Wed Apr 19 16:21:29 2017 +1000
Change 64-bit time type for windows
Reviewed-by: Andy Polyakov <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/3248)
-----------------------------------------------------------------------
Summary of changes:
fuzz/client.c | 2 +-
fuzz/server.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fuzz/client.c b/fuzz/client.c
index 622d782..92ec6c0 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 1a6dd2c..93cdc68 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)
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
