Commit ee2afa00ba2b0c6bb52eae66259e0b6a01098a77
2021-11-22T05:11:10
SDL_mfijoystick.m: fix build using older toolchains Fixes https://github.com/libsdl-org/SDL/issues/4992 Fixes https://github.com/libsdl-org/SDL/issues/4958
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/src/joystick/iphoneos/SDL_mfijoystick.m b/src/joystick/iphoneos/SDL_mfijoystick.m
index 08ed418..605651f 100644
--- a/src/joystick/iphoneos/SDL_mfijoystick.m
+++ b/src/joystick/iphoneos/SDL_mfijoystick.m
@@ -1331,6 +1331,7 @@ IOS_JoystickGetCapabilities(SDL_Joystick *joystick)
{
Uint32 result = 0;
+#if defined(ENABLE_MFI_LIGHT) || defined(ENABLE_MFI_RUMBLE)
@autoreleasepool {
SDL_JoystickDeviceItem *device = joystick->hwdata;
@@ -1340,13 +1341,13 @@ IOS_JoystickGetCapabilities(SDL_Joystick *joystick)
if (@available(macos 11.0, iOS 14.0, tvOS 14.0, *)) {
GCController *controller = device->controller;
-#ifdef ENABLE_MFI_LIGHT
+ #ifdef ENABLE_MFI_LIGHT
if (controller.light) {
result |= SDL_JOYCAP_LED;
}
-#endif /* ENABLE_MFI_LIGHT */
+ #endif
-#ifdef ENABLE_MFI_RUMBLE
+ #ifdef ENABLE_MFI_RUMBLE
if (controller.haptics) {
for (GCHapticsLocality locality in controller.haptics.supportedLocalities) {
if ([locality isEqualToString:GCHapticsLocalityHandles]) {
@@ -1356,9 +1357,10 @@ IOS_JoystickGetCapabilities(SDL_Joystick *joystick)
}
}
}
-#endif /* ENABLE_MFI_RUMBLE */
+ #endif
}
}
+#endif /* ENABLE_MFI_LIGHT || ENABLE_MFI_RUMBLE */
return result;
}