diff options
Diffstat (limited to 'src/wrapped/wrappedsdl2.c')
| -rwxr-xr-x | src/wrapped/wrappedsdl2.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/wrapped/wrappedsdl2.c b/src/wrapped/wrappedsdl2.c index 0de950a4..7e266c17 100755 --- a/src/wrapped/wrappedsdl2.c +++ b/src/wrapped/wrappedsdl2.c @@ -80,13 +80,11 @@ typedef struct typedef void (*vFv_t)(); typedef void (*vFiupV_t)(int64_t, uint64_t, void*, va_list); -typedef void (*vFGppp_t)(SDL_JoystickGUID, void*, void*, void*); #define ADDED_FUNCTIONS() \ GO(SDL_Quit, vFv_t) \ GO(SDL_AllocRW, sdl2_allocrw) \ GO(SDL_FreeRW, sdl2_freerw) \ - GO(SDL_LogMessageV, vFiupV_t) \ - GO(SDL_GetJoystickGUIDInfo, vFGppp_t) + GO(SDL_LogMessageV, vFiupV_t) #include "generated/wrappedsdl2types.h" typedef struct sdl2_my_s { @@ -880,17 +878,17 @@ EXPORT void my2_SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, uint16_t *vend, u my->SDL_GetJoystickGUIDInfo(guid, vend, prod, ver); // fallback else { - uint16_t *guid16 = (uint16_t *)guid.data; - if (guid16[1]==0x0000 && guid16[3]==0x0000 && guid16[5]==0x0000) - { - if(vend) *vend = guid16[2]; - if(prod) *prod = guid16[4]; - if(ver) *ver = guid16[6]; - } else { + uint16_t *guid16 = (uint16_t *)guid.data; + if (guid16[1]==0x0000 && guid16[3]==0x0000 && guid16[5]==0x0000) + { + if(vend) *vend = guid16[2]; + if(prod) *prod = guid16[4]; + if(ver) *ver = guid16[6]; + } else { if(vend) *vend = 0; if(prod) *prod = 0; if(ver) *ver = 0; - } + } } } |