| @@ -36,14 +36,10 @@ | |||||
| //============================================================================== | //============================================================================== | ||||
| #if JUCE_MAC | #if JUCE_MAC | ||||
| #define Point CarbonDummyPointName | |||||
| #define Component CarbonDummyCompName | |||||
| #if JUCE_QUICKTIME | #if JUCE_QUICKTIME | ||||
| #import <QTKit/QTKit.h> | #import <QTKit/QTKit.h> | ||||
| #endif | #endif | ||||
| #include <AudioToolbox/AudioToolbox.h> | #include <AudioToolbox/AudioToolbox.h> | ||||
| #undef Component | |||||
| #undef Point | |||||
| #elif JUCE_IOS | #elif JUCE_IOS | ||||
| #import <AudioToolbox/AudioToolbox.h> | #import <AudioToolbox/AudioToolbox.h> | ||||
| @@ -40,11 +40,7 @@ | |||||
| #if JUCE_SUPPORT_CARBON \ | #if JUCE_SUPPORT_CARBON \ | ||||
| && ((JUCE_PLUGINHOST_VST || JUCE_PLUGINHOST_AU) \ | && ((JUCE_PLUGINHOST_VST || JUCE_PLUGINHOST_AU) \ | ||||
| || ! (defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)) | || ! (defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)) | ||||
| #define Point CarbonDummyPointName // (workaround to avoid definition of "Point" by old Carbon headers) | |||||
| #define Component CarbonDummyCompName | |||||
| #include <Carbon/Carbon.h> | #include <Carbon/Carbon.h> | ||||
| #undef Point | |||||
| #undef Component | |||||
| #endif | #endif | ||||
| #endif | #endif | ||||
| @@ -37,11 +37,7 @@ | |||||
| #if JUCE_MAC | #if JUCE_MAC | ||||
| #if JUCE_QUICKTIME | #if JUCE_QUICKTIME | ||||
| #define Point CarbonDummyPointName | |||||
| #define Component CarbonDummyCompName | |||||
| #import <QTKit/QTKit.h> | #import <QTKit/QTKit.h> | ||||
| #undef Point | |||||
| #undef Component | |||||
| #endif | #endif | ||||
| //============================================================================== | //============================================================================== | ||||