From f7b9c11e069123fd0a248cf4d3972874f948b781 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 8 Feb 2023 14:01:02 +0300
Subject: [PATCH] stricten SDL_CondWaitTimeout and SDL_SemWaitTimeout, too
no prototype mismatch warnings remain
---
src/sdl2_compat.c | 12 ++++++++++++
src/sdl3_syms.h | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index a8af310..1333822 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -4693,6 +4693,18 @@ SDL_SensorOpen(int idx)
}
+DECLSPEC int SDLCALL
+SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms)
+{
+ return SDL3_CondWaitTimeout(cond, mutex, (Sint32)ms);
+}
+DECLSPEC int SDLCALL
+SDL_SemWaitTimeout(SDL_sem *sem, Uint32 ms)
+{
+ return SDL3_SemWaitTimeout(sem, (Sint32)ms);
+}
+
+
DECLSPEC void * SDLCALL
SDL_SIMDAlloc(const size_t len)
{
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index 3a4e615..0e466ed 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -263,7 +263,7 @@ SDL3_SYM_PASSTHROUGH(SDL_sem*,CreateSemaphore,(Uint32 a),(a),return)
SDL3_SYM_PASSTHROUGH(void,DestroySemaphore,(SDL_sem *a),(a),)
SDL3_SYM_PASSTHROUGH(int,SemWait,(SDL_sem *a),(a),return)
SDL3_SYM_PASSTHROUGH(int,SemTryWait,(SDL_sem *a),(a),return)
-SDL3_SYM_PASSTHROUGH(int,SemWaitTimeout,(SDL_sem *a, Uint32 b),(a,b),return)
+SDL3_SYM(int,SemWaitTimeout,(SDL_sem *a, Sint32 b),(a,b),return)
SDL3_SYM_PASSTHROUGH(int,SemPost,(SDL_sem *a),(a),return)
SDL3_SYM_PASSTHROUGH(Uint32,SemValue,(SDL_sem *a),(a),return)
SDL3_SYM_PASSTHROUGH(SDL_cond*,CreateCond,(void),(),return)
@@ -271,7 +271,7 @@ SDL3_SYM_PASSTHROUGH(void,DestroyCond,(SDL_cond *a),(a),)
SDL3_SYM_PASSTHROUGH(int,CondSignal,(SDL_cond *a),(a),return)
SDL3_SYM_PASSTHROUGH(int,CondBroadcast,(SDL_cond *a),(a),return)
SDL3_SYM_PASSTHROUGH(int,CondWait,(SDL_cond *a, SDL_mutex *b),(a,b),return)
-SDL3_SYM_PASSTHROUGH(int,CondWaitTimeout,(SDL_cond *a, SDL_mutex *b, Uint32 c),(a,b,c),return)
+SDL3_SYM(int,CondWaitTimeout,(SDL_cond *a, SDL_mutex *b, Sint32 c),(a,b,c),return)
SDL3_SYM_PASSTHROUGH(const char*,GetPixelFormatName,(Uint32 a),(a),return)
SDL3_SYM_RENAMED(SDL_bool,PixelFormatEnumToMasks,GetMasksForPixelFormatEnum,(Uint32 a, int *b, Uint32 *c, Uint32 *d, Uint32 *e, Uint32 *f),(a,b,c,d,e,f),return)
SDL3_SYM_RENAMED(Uint32,MasksToPixelFormatEnum,GetPixelFormatEnumForMasks,(int a, Uint32 b, Uint32 c, Uint32 d, Uint32 e),(a,b,c,d,e),return)