Merge 'mingw-safer-compat-poll'

This was pull request #1003 from shoelzer/master poll: Use GetTickCount64 to avoid wraparound issues Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Feb 23, 2019 · c2d71c1 · c2d71c1
2 parents 5a8df07 + 81ed73f
commit c2d71c1
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
@@ -269,6 +269,20 @@ win32_compute_revents_socket (SOCKET h, int sought, long lNetworkEvents)
   return happened;
 }
 
+#include <windows.h>
+#include "compat/win32/lazyload.h"
+
+static ULONGLONG CompatGetTickCount64(void)
+{
+	DECLARE_PROC_ADDR(kernel32.dll, ULONGLONG, GetTickCount64, void);
+
+	if (!INIT_PROC_ADDR(GetTickCount64))
+		return (ULONGLONG)GetTickCount();
+
+	return GetTickCount64();
+}
+#define GetTickCount64 CompatGetTickCount64
+
 #else /* !MinGW */
 
 /* Convert select(2) returned fd_sets into poll(2) revents values.  */