geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac: Fix handling of deprecated symbol. 

This needs to check what our deployment target is, not what SDK
is available, since this is a linker symbol and not an enum
value or whatever.

Also removed a copy/paste error that mentioned CoreAudio in
the haptic subsystem.

Fixes #6534.
main
Ryan C. Gordon 2022-11-16 22:02:21 -05:00
parent 913e403f2a
commit bb0b8adacc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/haptic/darwin/SDL_syshaptic_c.h
View File

@ -20,12 +20,10 @@
*/ */
/* Things named "Master" were renamed to "Main" in macOS 12.0's SDK. */ /* Things named "Master" were renamed to "Main" in macOS 12.0's SDK. */
#if MACOSX_COREAUDIO
#include <AvailabilityMacros.h> #include <AvailabilityMacros.h>
#ifndef MAC_OS_VERSION_12_0 #if MAC_OS_X_VERSION_MIN_REQUIRED < 120000
#define kIOMainPortDefault kIOMasterPortDefault #define kIOMainPortDefault kIOMasterPortDefault
#endif #endif
#endif
extern int MacHaptic_MaybeAddDevice( io_object_t device ); extern int MacHaptic_MaybeAddDevice( io_object_t device );
extern int MacHaptic_MaybeRemoveDevice( io_object_t device ); extern int MacHaptic_MaybeRemoveDevice( io_object_t device );

7
src/hidapi/SDL_hidapi.c
View File

@ -47,6 +47,11 @@
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/hid/IOHIDDevice.h> #include <IOKit/hid/IOHIDDevice.h>
#include <IOKit/usb/USBSpec.h> #include <IOKit/usb/USBSpec.h>
#include <AvailabilityMacros.h>
/* Things named "Master" were renamed to "Main" in macOS 12.0's SDK. */
#if MAC_OS_X_VERSION_MIN_REQUIRED < 120000
#define kIOMainPortDefault kIOMasterPortDefault
#endif
#endif #endif
#include "../core/linux/SDL_udev.h" #include "../core/linux/SDL_udev.h"
@ -250,7 +255,7 @@ HIDAPI_InitializeDiscovery()
#endif /* defined(__WIN32__) || defined(__WINGDK__) */ #endif /* defined(__WIN32__) || defined(__WINGDK__) */
#if defined(__MACOSX__) #if defined(__MACOSX__)
SDL_HIDAPI_discovery.m_notificationPort = IONotificationPortCreate(kIOMasterPortDefault); SDL_HIDAPI_discovery.m_notificationPort = IONotificationPortCreate(kIOMainPortDefault);
if (SDL_HIDAPI_discovery.m_notificationPort) { if (SDL_HIDAPI_discovery.m_notificationPort) {
{ {
io_iterator_t portIterator = 0; io_iterator_t portIterator = 0;