From 5e76d63c062e65cf8924e10e2eb5a914e3354b69 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 12 Dec 2020 04:46:22 +0100
Subject: [PATCH] Resolve some Xcode12 C++11, sigc++ issues

---
 libs/backends/coreaudio/coreaudio_backend.cc | 2 ++
 libs/backends/coreaudio/coremidi_io.cc       | 1 +
 libs/backends/jack/jack_utils.cc             | 1 +
 3 files changed, 4 insertions(+)

diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc
index eca54b5844..c355c89db5 100644
--- a/libs/backends/coreaudio/coreaudio_backend.cc
+++ b/libs/backends/coreaudio/coreaudio_backend.cc
@@ -24,6 +24,8 @@
 #include <mach/thread_policy.h>
 #include <mach/thread_act.h>
 
+#undef nil
+
 #include <glibmm.h>
 
 #include "coreaudio_backend.h"
diff --git a/libs/backends/coreaudio/coremidi_io.cc b/libs/backends/coreaudio/coremidi_io.cc
index 2a44ac3431..f12dafdb81 100644
--- a/libs/backends/coreaudio/coremidi_io.cc
+++ b/libs/backends/coreaudio/coremidi_io.cc
@@ -18,6 +18,7 @@
 
 #include <sstream>
 #include <CoreAudio/HostTime.h>
+#undef nil
 
 #include "coremidi_io.h"
 #include "coreaudio_backend.h"
diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
index 8dd0d1393e..d9d89a0783 100644
--- a/libs/backends/jack/jack_utils.cc
+++ b/libs/backends/jack/jack_utils.cc
@@ -29,6 +29,7 @@
 #include <CoreFoundation/CFString.h>
 #include <sys/param.h>
 #include <mach-o/dyld.h>
+#undef nil
 #endif
 
 #ifdef PLATFORM_WINDOWS