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

Mac: Fix compiler warning when building with a min target >= 10.6.

This commit is contained in:
Ryan C. Gordon 2015-05-26 12:52:28 -04:00
parent 37f4eb5379
commit d1980b93fb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/joystick/darwin/SDL_sysjoystick.c
View File

@ -436,7 +436,11 @@ JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender, IOHIDDevic
device->instance_id = ++s_joystick_instance_id; device->instance_id = ++s_joystick_instance_id;
/* We have to do some storage of the io_service_t for SDL_HapticOpenFromJoystick */ /* We have to do some storage of the io_service_t for SDL_HapticOpenFromJoystick */
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
if (IOHIDDeviceGetService != NULL) { /* weak reference: available in 10.6 and later. */ if (IOHIDDeviceGetService != NULL) { /* weak reference: available in 10.6 and later. */
#endif
const io_service_t ioservice = IOHIDDeviceGetService(ioHIDDeviceObject); const io_service_t ioservice = IOHIDDeviceGetService(ioHIDDeviceObject);
#if SDL_HAPTIC_IOKIT #if SDL_HAPTIC_IOKIT
if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK)) { if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK)) {
@ -444,7 +448,10 @@ JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender, IOHIDDevic
MacHaptic_MaybeAddDevice(ioservice); MacHaptic_MaybeAddDevice(ioservice);
} }
#endif #endif
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
} }
#endif
/* Add device to the end of the list */ /* Add device to the end of the list */
if ( !gpDeviceList ) { if ( !gpDeviceList ) {