add operator bool() to Evoral::Beats

[ardour.git] / libs / appleutility / CAConditionalMacros.h

diff --git a/libs/appleutility/CAConditionalMacros.h b/libs/appleutility/CAConditionalMacros.h
index 62f642709a3f6dcd102759d2d74656223d860280..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__)
+#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