Land #1368 - use winsock's timeval in sys/time.h shim

2 files changed, 6 insertions, 7 deletions

diff --git a/crypto/compat/posix_win.c b/crypto/compat/posix_win.c
index 60b2896..14b79f5 100644
--- a/crypto/compat/posix_win.c
+++ b/crypto/compat/posix_win.c
@@ -303,7 +303,7 @@ int gettimeofday(struct timeval *tp, void *tzp)
         time = ((uint64_t)file_time.dwLowDateTime);
         time += ((uint64_t)file_time.dwHighDateTime) << 32;
 
-        tp->tv_sec = (long long)((time - EPOCH) / 10000000L);
+        tp->tv_sec = (long)((time - EPOCH) / 10000000L);
         tp->tv_usec = (long)(system_time.wMilliseconds * 1000);
         return 0;
 }
diff --git a/include/compat/sys/time.h b/include/compat/sys/time.h
index 2448969..0388333 100644
--- a/include/compat/sys/time.h
+++ b/include/compat/sys/time.h
@@ -7,16 +7,15 @@
 #define LIBCRYPTOCOMPAT_SYS_TIME_H
 
 #ifdef _MSC_VER
+/*
+ * Use the winsock struct timeval: it is what <openssl/dtls1.h> gives
+ * callers of DTLSv1_get_timeout() and the dgram BIO ctrls, so libssl
+ * must be built against the same layout.
+ */
 #include <winsock2.h>
 
-#define timeval libressl_timeval
 #define gettimeofday libressl_gettimeofday
 
-struct timeval {
-        long long       tv_sec;
-        long            tv_usec;
-};
-
 int gettimeofday(struct timeval *tp, void *tzp);
 #else
 #include_next <sys/time.h>