bss_dgram.c,d1_lib.c: make it compile with mingw.

Submitted by: Roumen Petrov

bss_dgram.c,d1_lib.c: make it compile with mingw.
Submitted by: Roumen Petrov
972b0dc3 · Andy Polyakov · 315cd871 · 972b0dc3 · 972b0dc3
隐藏空白更改
内联并排

Showing with 8 addition and 0 deletion

crypto/bio/bss_dgram.c crypto/bio/bss_dgram.c +4 -0

ssl/d1_lib.c ssl/d1_lib.c +4 -0

未找到文件。
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1901,7 +1901,11 @@ static void get_current_time(struct timeval *t)

 	GetSystemTime(&st);
 	SystemTimeToFileTime(&st,&now.ft);
+#ifdef	__MINGW32__
+	now.ul -= 116444736000000000ULL;
+#else
 	now.ul -= 116444736000000000UI64;	/* re-bias to 1/1/1970 */
+#endif
 	t->tv_sec  = (long)(now.ul/10000000);
 	t->tv_usec = ((int)(now.ul%10000000))/10;
 #elif defined(OPENSSL_SYS_VMS)

--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -487,7 +487,11 @@ static void get_current_time(struct timeval *t)

 	GetSystemTime(&st);
 	SystemTimeToFileTime(&st,&now.ft);
+#ifdef	__MINGW32__
+	now.ul -= 116444736000000000ULL;
+#else
 	now.ul -= 116444736000000000UI64;	/* re-bias to 1/1/1970 */
+#endif
 	t->tv_sec  = (long)(now.ul/10000000);
 	t->tv_usec = ((int)(now.ul%10000000))/10;
 #elif defined(OPENSSL_SYS_VMS)