timer: Use the emscripten-specific code on Emscripten, even with threading.

icculus · icculus · commit 4d8f84f161cd · 2025-12-30T18:57:55.000-05:00
Fixes #14640.
diff --git a/src/timer/SDL_timer.c b/src/timer/SDL_timer.c
@@ -25,7 +25,7 @@
 
 // #define DEBUG_TIMERS
 
-#if !defined(SDL_PLATFORM_EMSCRIPTEN) || !defined(SDL_THREADS_DISABLED)
+#if !defined(SDL_PLATFORM_EMSCRIPTEN)
 
 typedef struct SDL_Timer
 {
@@ -407,7 +407,7 @@ bool SDL_RemoveTimer(SDL_TimerID id)
     }
 }
 
-#else
+#else   // Emscripten-specific implementation.
 
 #include <emscripten/emscripten.h>
 #include <emscripten/eventloop.h>
@@ -533,7 +533,7 @@ bool SDL_RemoveTimer(SDL_TimerID id)
     }
 }
 
-#endif // !SDL_PLATFORM_EMSCRIPTEN || !SDL_THREADS_DISABLED
+#endif // !SDL_PLATFORM_EMSCRIPTEN
 
 static Uint64 tick_start;
 static Uint32 tick_numerator_ns;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`// #define DEBUG_TIMERS`
`27`	`27`
`28`		`-#if !defined(SDL_PLATFORM_EMSCRIPTEN) \|\| !defined(SDL_THREADS_DISABLED)`
	`28`	`+#if !defined(SDL_PLATFORM_EMSCRIPTEN)`
`29`	`29`
`30`	`30`	`typedef struct SDL_Timer`
`31`	`31`	`{`
`@@ -407,7 +407,7 @@ bool SDL_RemoveTimer(SDL_TimerID id)`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`
`410`		`-#else`
	`410`	`+#else // Emscripten-specific implementation.`
`411`	`411`
`412`	`412`	`#include <emscripten/emscripten.h>`
`413`	`413`	`#include <emscripten/eventloop.h>`
`@@ -533,7 +533,7 @@ bool SDL_RemoveTimer(SDL_TimerID id)`
`533`	`533`	`}`
`534`	`534`	`}`
`535`	`535`
`536`		`-#endif // !SDL_PLATFORM_EMSCRIPTEN \|\| !SDL_THREADS_DISABLED`
	`536`	`+#endif // !SDL_PLATFORM_EMSCRIPTEN`
`537`	`537`
`538`	`538`	`static Uint64 tick_start;`
`539`	`539`	`static Uint32 tick_numerator_ns;`