encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace bool stuff in controller_type.h with SDL_bool. 

remove bool<->SDL_bool dance in SDL_joystick.c:SDL_IsJoystickSteamController()
after the controller_type.h change.
This commit is contained in:
Ozkan Sezer 2018-09-28 17:01:24 +03:00
parent fde82e5972
commit 5454765a22
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/SDL_joystick.c
View File

@ -1135,7 +1135,7 @@ SDL_IsJoystickNintendoSwitchPro(Uint16 vendor, Uint16 product)
SDL_bool SDL_bool
SDL_IsJoystickSteamController(Uint16 vendor, Uint16 product) SDL_IsJoystickSteamController(Uint16 vendor, Uint16 product)
{ {
return BIsSteamController(GuessControllerType(vendor, product)) ? SDL_TRUE : SDL_FALSE; return BIsSteamController(GuessControllerType(vendor, product));
} }
SDL_bool SDL_bool

3
src/joystick/controller_type.h
View File

@ -25,7 +25,6 @@
#endif #endif
#ifndef __cplusplus #ifndef __cplusplus
typedef enum { false, true } bool;
#define inline SDL_INLINE #define inline SDL_INLINE
#endif #endif
@ -65,7 +64,7 @@ typedef enum
k_eControllertype_GenericMouse = 800, k_eControllertype_GenericMouse = 800,
} EControllerType; } EControllerType;
static inline bool BIsSteamController( EControllerType eType ) static inline SDL_bool BIsSteamController( EControllerType eType )
{ {
return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 ); return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 );
} }