From ffe61e0895fd1aea746619280eca3cfd59b0c182 Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Tue, 10 May 2022 21:02:26 +0300 Subject: [macOS / iOS] Fix text-to-speech build with older macOS / iOS SDK. Add __has_include check for AVFAudio include. Add some explicit casts to avoid conflicts. Change all `include`s to `import`s for consistency. --- drivers/coremidi/midi_driver_coremidi.cpp | 4 ++-- drivers/coremidi/midi_driver_coremidi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/coremidi') diff --git a/drivers/coremidi/midi_driver_coremidi.cpp b/drivers/coremidi/midi_driver_coremidi.cpp index ecd10f900b..dc69ab9472 100644 --- a/drivers/coremidi/midi_driver_coremidi.cpp +++ b/drivers/coremidi/midi_driver_coremidi.cpp @@ -34,8 +34,8 @@ #include "core/string/print_string.h" -#include -#include +#import +#import void MIDIDriverCoreMidi::read(const MIDIPacketList *packet_list, void *read_proc_ref_con, void *src_conn_ref_con) { MIDIPacket *packet = const_cast(packet_list->packet); diff --git a/drivers/coremidi/midi_driver_coremidi.h b/drivers/coremidi/midi_driver_coremidi.h index be0a9f610e..0085141c6d 100644 --- a/drivers/coremidi/midi_driver_coremidi.h +++ b/drivers/coremidi/midi_driver_coremidi.h @@ -36,7 +36,7 @@ #include "core/os/midi_driver.h" #include "core/templates/vector.h" -#include +#import #include class MIDIDriverCoreMidi : public MIDIDriver { -- cgit v1.2.3