From 61685c31bced2f9139821352baf0d619186e4ac4 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 2 Feb 2025 07:30:37 +0300
Subject: [PATCH] minor sync with latest SDL3 and SDL2
---
include/SDL2/SDL_haptic.h | 2 +-
src/sdl3_include_wrapper.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/SDL2/SDL_haptic.h b/include/SDL2/SDL_haptic.h
index 61c62a5..f679c57 100644
--- a/include/SDL2/SDL_haptic.h
+++ b/include/SDL2/SDL_haptic.h
@@ -624,7 +624,7 @@ typedef struct SDL_HapticCondition
/* Header */
Uint16 type; /**< SDL_HAPTIC_SPRING, SDL_HAPTIC_DAMPER,
SDL_HAPTIC_INERTIA or SDL_HAPTIC_FRICTION */
- SDL_HapticDirection direction; /**< Direction of the effect - Not used ATM. */
+ SDL_HapticDirection direction; /**< Direction of the effect. */
/* Replay */
Uint32 length; /**< Duration of the effect. */
diff --git a/src/sdl3_include_wrapper.h b/src/sdl3_include_wrapper.h
index a5a6015..e83f74d 100644
--- a/src/sdl3_include_wrapper.h
+++ b/src/sdl3_include_wrapper.h
@@ -1264,6 +1264,7 @@
#define SDL_GetThreadState IGNORE_THIS_VERSION_OF_SDL_GetThreadState
#define SDL_AudioStreamDevicePaused IGNORE_THIS_VERSION_OF_SDL_AudioStreamDevicePaused
#define SDL_ClickTrayEntry IGNORE_THIS_VERSION_OF_SDL_ClickTrayEntry
+#define SDL_UpdateTrays IGNORE_THIS_VERSION_OF_SDL_UpdateTrays
#define SDL_FUNCTION_POINTER_IS_VOID_POINTER 1
@@ -6212,6 +6213,10 @@
#undef SDL_ClickTrayEntry
#endif
+#ifdef SDL_UpdateTrays
+#undef SDL_UpdateTrays
+#endif
+
#undef SDL_ThreadID /* see at top. */
/* dump the macro CreateThread versions, too. */