diff --git a/gtk2_ardour/fix_carbon.h b/gtk2_ardour/fix_carbon.h index bc483e33a8..5c1922ed0d 100644 --- 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 */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 #include "MacTypes.h" #else #include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h" @@ -36,6 +36,7 @@ #undef Yes #undef No #undef nil + #endif #endif diff --git a/libs/appleutility/CAConditionalMacros.h b/libs/appleutility/CAConditionalMacros.h index c5100ad354..87b2dc02d2 100644 --- a/libs/appleutility/CAConditionalMacros.h +++ b/libs/appleutility/CAConditionalMacros.h @@ -65,10 +65,10 @@ // Include the regular ConditionalMacros.h too, since it has useful stuff that // TargetConditionals.h lacks for some reason. -#if CoreAudio_Use_Framework_Includes && !(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9) - #include +#if CoreAudio_Use_Framework_Includes && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1090) + #include "ConditionalMa243cros.h" #else - #include "ConditionalMacros.h" + #include #endif #endif