Skip to content

Commit

Permalink
Merge pull request #2092 from dscho/mingw-safer-compat-poll
Browse files Browse the repository at this point in the history
fixup! poll: lazy-load GetTickCount64()
  • Loading branch information
dscho committed Feb 25, 2019
2 parents ec3a6e5 + bf64148 commit f6431eb
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions compat/poll/poll.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,20 +269,6 @@ 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. */
Expand Down

0 comments on commit f6431eb

Please sign in to comment.