NOOP, proper label for flat carbon header includes

diff --git a/gtk2_ardour/fix_carbon.h b/gtk2_ardour/fix_carbon.h
index 3fd3f4e304695a16213aa315e696b42d396cc46f..f021659c2df40269b7d3a51690aab8872cef6a13 100644 (file)
--- a/gtk2_ardour/fix_carbon.h
+++ b/gtk2_ardour/fix_carbon.h
@@ -25,7 +25,7 @@
 /* an awful hack to stop Carbon #defines from messing with other code
  */
 
-#ifdef OSX_MAVERICKS
+#ifdef CARBON_FLAT_HEADERS
 #include "MacTypes.h"
 #else
 #include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h" 

diff --git a/libs/appleutility/CAConditionalMacros.h b/libs/appleutility/CAConditionalMacros.h
index 0449ae8358d12ccceb1bbc214038ef859fe1443b..4f504699c7bf902a6ce93cca2b0bd64c1bffaa23 100644 (file)
--- a/libs/appleutility/CAConditionalMacros.h
+++ b/libs/appleutility/CAConditionalMacros.h
@@ -55,7 +55,7 @@
 #include "TargetConditionals.h"
 
 //     Determine whether or not to use framework style includes for system headers
-#if !defined(CoreAudio_Use_Framework_Includes) && !defined(__COREAUDIO_USE_FLAT_INCLUDES__) && !defined (OSX_MAVERICKS)
+#if !defined(CoreAudio_Use_Framework_Includes) && !defined(__COREAUDIO_USE_FLAT_INCLUDES__) && !defined (CARBON_FLAT_HEADERS)
        #if     TARGET_RT_MAC_MACHO
                #define CoreAudio_Use_Framework_Includes        1
        #else

diff --git a/wscript b/wscript
index 5ca4228cbb5f2ea30800be22dbb6798a56986c28..7ebe4d1e8a870d7163edf5d02c2287c3ebe74f40 100644 (file)
--- a/wscript
+++ b/wscript
@@ -208,7 +208,7 @@ def set_compiler_flags (conf,opt):
         cxx_flags.append('-std=c++11')
         if platform == "darwin":
             cxx_flags.append('--stdlib=libstdc++')
-            cxx_flags.append('-DOSX_MAVERICKS')
+            cxx_flags.append('-DCARBON_FLAT_HEADERS')
             linker_flags.append('--stdlib=libstdc++')
             # Prevents visibility issues in standard headers
             conf.define("_DARWIN_C_SOURCE", 1)