From b51e835bafa3d96fa6d7a66b37762c5605257529 Mon Sep 17 00:00:00 2001
From: Tom Poole <tom@juce.com>
Date: Tue, 2 Aug 2022 10:00:12 +0100
Subject: [PATCH] Mac Catalyst: Fix compilation issues

---
 .../juce_audio_devices/native/juce_ios_Audio.cpp   | 14 +++++++++-----
 modules/juce_core/native/juce_BasicNativeHeaders.h |  3 +++
 modules/juce_core/native/juce_posix_SharedCode.h   |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/juce_audio_devices/native/juce_ios_Audio.cpp b/modules/juce_audio_devices/native/juce_ios_Audio.cpp
index a3821a6e34..4168056b42 100644
--- a/modules/juce_audio_devices/native/juce_ios_Audio.cpp
+++ b/modules/juce_audio_devices/native/juce_ios_Audio.cpp
@@ -705,13 +705,17 @@ struct iOSAudioIODevice::Pimpl      : public AsyncUpdater
     JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
     Image getIcon (int size)
     {
-        if (interAppAudioConnected)
+        if (@available (macCatalyst 14.0, *))
         {
-            UIImage* hostUIImage = AudioOutputUnitGetHostIcon (audioUnit, size);
-            if (hostUIImage != nullptr)
-                return juce_createImageFromUIImage (hostUIImage);
+            if (interAppAudioConnected)
+            {
+                UIImage* hostUIImage = AudioOutputUnitGetHostIcon (audioUnit, size);
+                if (hostUIImage != nullptr)
+                    return juce_createImageFromUIImage (hostUIImage);
+            }
         }
-        return Image();
+
+        return {};
     }
     JUCE_END_IGNORE_WARNINGS_GCC_LIKE
    #endif
diff --git a/modules/juce_core/native/juce_BasicNativeHeaders.h b/modules/juce_core/native/juce_BasicNativeHeaders.h
index c45ac6e3b3..52397e8860 100644
--- a/modules/juce_core/native/juce_BasicNativeHeaders.h
+++ b/modules/juce_core/native/juce_BasicNativeHeaders.h
@@ -32,7 +32,10 @@
    #define GLES_SILENCE_DEPRECATION 1
   #endif
 
+  #define Component CarbonDummyCompName
   #import <Foundation/Foundation.h>
+  #undef Component
+
   #import <UIKit/UIKit.h>
   #import <CoreData/CoreData.h>
   #import <MobileCoreServices/MobileCoreServices.h>
diff --git a/modules/juce_core/native/juce_posix_SharedCode.h b/modules/juce_core/native/juce_posix_SharedCode.h
index 700e191e9e..66ff9669b7 100644
--- a/modules/juce_core/native/juce_posix_SharedCode.h
+++ b/modules/juce_core/native/juce_posix_SharedCode.h
@@ -167,7 +167,7 @@ int juce_siginterrupt (int sig, int flag)
 //==============================================================================
 namespace
 {
-   #if JUCE_LINUX || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)
+   #if JUCE_LINUX || (JUCE_IOS && (! TARGET_OS_MACCATALYST) && (! __DARWIN_ONLY_64_BIT_INO_T)) // (this iOS stuff is to avoid a simulator bug)
     using juce_statStruct = struct stat64;
     #define JUCE_STAT  stat64
    #else