From 73a8143581e6fb01fbcd18c73af5f3badd24377e Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 2 Feb 2025 08:04:24 +0300
Subject: [PATCH] timer, windows: allow building high resolution code with old
SDKs.
---
src/timer/windows/SDL_systimer.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/timer/windows/SDL_systimer.c b/src/timer/windows/SDL_systimer.c
index 49f27cfe9d511..f6f4b15c72b7f 100644
--- a/src/timer/windows/SDL_systimer.c
+++ b/src/timer/windows/SDL_systimer.c
@@ -24,6 +24,11 @@
#include "../../core/windows/SDL_windows.h"
+/* CREATE_WAITABLE_TIMER_HIGH_RESOLUTION flag was added in Windows 10 version 1803. */
+#ifndef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
+#define CREATE_WAITABLE_TIMER_HIGH_RESOLUTION 0x2
+#endif
+
typedef HANDLE (WINAPI *CreateWaitableTimerExW_t)(LPSECURITY_ATTRIBUTES lpTimerAttributes, LPCWSTR lpTimerName, DWORD dwFlags, DWORD dwDesiredAccess);
static CreateWaitableTimerExW_t pCreateWaitableTimerExW;
@@ -35,7 +40,6 @@ static void SDL_CleanupWaitableHandle(void *handle)
CloseHandle(handle);
}
-#ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
static HANDLE SDL_GetWaitableTimer(void)
{
static SDL_TLSID TLS_timer_handle;
@@ -67,7 +71,6 @@ static HANDLE SDL_GetWaitableTimer(void)
}
return timer;
}
-#endif // CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
static HANDLE SDL_GetWaitableEvent(void)
{
@@ -102,11 +105,6 @@ Uint64 SDL_GetPerformanceFrequency(void)
void SDL_SYS_DelayNS(Uint64 ns)
{
- /* CREATE_WAITABLE_TIMER_HIGH_RESOLUTION flag was added in Windows 10 version 1803.
- *
- * Use the compiler version to determine availability.
- */
-#ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
HANDLE timer = SDL_GetWaitableTimer();
if (timer) {
LARGE_INTEGER due_time;
@@ -116,7 +114,6 @@ void SDL_SYS_DelayNS(Uint64 ns)
}
return;
}
-#endif
const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_MS;
if (ns > max_delay) {