From 12aa89d4db00d17739a50a2011accfe5f1a5abf9 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 27 Mar 2023 15:26:11 +0200 Subject: [PATCH] Fix -Wundef warnings due to use of unguarded __TVOS__ --- src/hidapi/SDL_hidapi.c | 4 ++-- src/hidapi/hidapi/hidapi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hidapi/SDL_hidapi.c b/src/hidapi/SDL_hidapi.c index 58fc50fb13..2019212595 100644 --- a/src/hidapi/SDL_hidapi.c +++ b/src/hidapi/SDL_hidapi.c @@ -595,7 +595,7 @@ static const SDL_UDEV_Symbols *udev_ctx = NULL; #include "hidapi/hidapi.h" #define HAVE_PLATFORM_BACKEND 1 #define udev_ctx 1 -#elif defined(__IOS__) || __TVOS__ +#elif defined(__IOS__) || defined(__TVOS__) /* The implementation for iOS and tvOS is in a separate .m file */ #include "hidapi/hidapi.h" #define HAVE_PLATFORM_BACKEND 1 @@ -1585,7 +1585,7 @@ int SDL_hid_get_indexed_string(SDL_hid_device *device, int string_index, wchar_t void SDL_hid_ble_scan(SDL_bool active) { -#if !defined(SDL_HIDAPI_DISABLED) && (defined(__IOS__) || __TVOS__) +#if !defined(SDL_HIDAPI_DISABLED) && (defined(__IOS__) || defined(__TVOS__)) hid_ble_scan(active); #endif } diff --git a/src/hidapi/hidapi/hidapi.h b/src/hidapi/hidapi/hidapi.h index dfe10fdc04..9fb8da461e 100644 --- a/src/hidapi/hidapi/hidapi.h +++ b/src/hidapi/hidapi/hidapi.h @@ -406,7 +406,7 @@ namespace NAMESPACE { */ HID_API_EXPORT const wchar_t* HID_API_CALL hid_error(hid_device *dev); -#if defined(__IOS__) || __TVOS__ +#if defined(__IOS__) || defined(__TVOS__) HID_API_EXPORT void HID_API_CALL hid_ble_scan(int active); #endif