Fix Apple Carbon #define interference

2020-10-11 21:40:31 +02:00
parent c6387c1ac9
commit 17f0b87648
2 changed files with 3 additions and 0 deletions
--- a/libs/ardour/vst3_module.cc
+++ b/libs/ardour/vst3_module.cc
@@ -22,6 +22,7 @@

 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
+#undef nil
 #elif defined PLATFORM_WINDOWS
 #include <windows.h>
 #include <glibmm.h>
--- a/libs/backends/coreaudio/coreaudio_pcmio.h
+++ b/libs/backends/coreaudio/coreaudio_pcmio.h
@@ -26,6 +26,8 @@
 #include <AudioUnit/AudioUnit.h>
 #include <AudioToolbox/AudioToolbox.h>

+#undef nil
+
 #include <map>
 #include <vector>
 #include <string>