From df06e950979ea43ee16e5e963aebb8844861d800 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 5 Feb 2025 17:10:46 -0800
Subject: [PATCH] Fixed the return value of SDL_MouseIsHaptic() and
SDL_JoystickIsHaptic()
---
src/dynapi/SDL_dynapi_procs.h | 4 ++--
src/sdl2_protos.h | 4 ++--
src/sdl3_syms.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index d8c7978..1cd4c25 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -188,9 +188,9 @@ SDL_DYNAPI_PROC(const char*,SDL_HapticName,(int a),(a),return)
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpen,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_HapticOpened,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_HapticIndex,(SDL_Haptic *a),(a),return)
-SDL_DYNAPI_PROC(int,SDL_MouseIsHaptic,(void),(),return)
+SDL_DYNAPI_PROC(SDL2_bool,SDL_MouseIsHaptic,(void),(),return)
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpenFromMouse,(void),(),return)
-SDL_DYNAPI_PROC(int,SDL_JoystickIsHaptic,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(SDL2_bool,SDL_JoystickIsHaptic,(SDL_Joystick *a),(a),return)
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpenFromJoystick,(SDL_Joystick *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_HapticClose,(SDL_Haptic *a),(a),)
SDL_DYNAPI_PROC(int,SDL_HapticNumEffects,(SDL_Haptic *a),(a),return)
diff --git a/src/sdl2_protos.h b/src/sdl2_protos.h
index 746f44e..3fb2229 100644
--- a/src/sdl2_protos.h
+++ b/src/sdl2_protos.h
@@ -186,9 +186,9 @@ SDL2_PROTO(const char*,HapticName,(int a))
SDL2_PROTO(SDL_Haptic*,HapticOpen,(int a))
SDL2_PROTO(int,HapticOpened,(int a))
SDL2_PROTO(int,HapticIndex,(SDL_Haptic *a))
-SDL2_PROTO(int,MouseIsHaptic,(void))
+SDL2_PROTO(SDL2_bool,MouseIsHaptic,(void))
SDL2_PROTO(SDL_Haptic*,HapticOpenFromMouse,(void))
-SDL2_PROTO(int,JoystickIsHaptic,(SDL_Joystick *a))
+SDL2_PROTO(SDL2_bool,JoystickIsHaptic,(SDL_Joystick *a))
SDL2_PROTO(SDL_Haptic*,HapticOpenFromJoystick,(SDL_Joystick *a))
SDL2_PROTO(void,HapticClose,(SDL_Haptic *a))
SDL2_PROTO(int,HapticNumEffects,(SDL_Haptic *a))
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index 7fc819e..8d20952 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -490,7 +490,7 @@ SDL3_SYM_RENAMED(Uint16,JoystickGetProductVersion,GetJoystickProductVersion,(SDL
SDL3_SYM_RENAMED(const char*,JoystickGetSerial,GetJoystickSerial,(SDL_Joystick *a),(a),return)
SDL3_SYM_RENAMED(SDL_JoystickType,JoystickGetType,GetJoystickType,(SDL_Joystick *a),(a),return)
SDL3_SYM_RENAMED(Uint16,JoystickGetVendor,GetJoystickVendor,(SDL_Joystick *a),(a),return)
-SDL3_SYM_RENAMED_RETCODE(bool,JoystickIsHaptic,IsJoystickHaptic,(SDL_Joystick *a),(a),return)
+SDL3_SYM_RENAMED_BOOL(bool,JoystickIsHaptic,IsJoystickHaptic,(SDL_Joystick *a),(a),return)
SDL3_SYM_RENAMED(const char*,JoystickName,GetJoystickName,(SDL_Joystick *a),(a),return)
SDL3_SYM_RENAMED(int,JoystickNumAxes,GetNumJoystickAxes,(SDL_Joystick *a),(a),return)
SDL3_SYM_RENAMED(int,JoystickNumBalls,GetNumJoystickBalls,(SDL_Joystick *a),(a),return)
@@ -533,7 +533,7 @@ SDL3_SYM_PASSTHROUGH(void,Metal_DestroyView,(SDL_MetalView a),(a),)
SDL3_SYM_PASSTHROUGH(void*,Metal_GetLayer,(SDL_MetalView a),(a),return)
SDL3_SYM(bool,MinimizeWindow,(SDL_Window *a),(a),return)
SDL3_SYM(bool,MixAudio,(Uint8 *a, const Uint8 *b, SDL_AudioFormat c, Uint32 d, float e),(a,b,c,d,e),return)
-SDL3_SYM_RENAMED_RETCODE(bool,MouseIsHaptic,IsMouseHaptic,(void),(),return)
+SDL3_SYM_RENAMED_BOOL(bool,MouseIsHaptic,IsMouseHaptic,(void),(),return)
SDL3_SYM_RENAMED(void,OnApplicationDidBecomeActive,OnApplicationDidEnterForeground,(void),(),)
SDL3_SYM_PASSTHROUGH(void,OnApplicationDidEnterBackground,(void),(),)
SDL3_SYM_PASSTHROUGH(void,OnApplicationDidReceiveMemoryWarning,(void),(),)