Browse Source

Removed a few more carbon workaround macros

tags/2021-05-28
jules 9 years ago
parent
commit
66793fc09b
3 changed files with 0 additions and 12 deletions
  1. +0
    -4
      modules/juce_audio_formats/juce_audio_formats.cpp
  2. +0
    -4
      modules/juce_audio_processors/juce_audio_processors.cpp
  3. +0
    -4
      modules/juce_video/juce_video.cpp

+ 0
- 4
modules/juce_audio_formats/juce_audio_formats.cpp View File

@@ -36,14 +36,10 @@
//==============================================================================
#if JUCE_MAC
#define Point CarbonDummyPointName
#define Component CarbonDummyCompName
#if JUCE_QUICKTIME
#import <QTKit/QTKit.h>
#endif
#include <AudioToolbox/AudioToolbox.h>
#undef Component
#undef Point
#elif JUCE_IOS
#import <AudioToolbox/AudioToolbox.h>


+ 0
- 4
modules/juce_audio_processors/juce_audio_processors.cpp View File

@@ -40,11 +40,7 @@
#if JUCE_SUPPORT_CARBON \
&& ((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))
#define Point CarbonDummyPointName // (workaround to avoid definition of "Point" by old Carbon headers)
#define Component CarbonDummyCompName
#include <Carbon/Carbon.h>
#undef Point
#undef Component
#endif
#endif


+ 0
- 4
modules/juce_video/juce_video.cpp View File

@@ -37,11 +37,7 @@
#if JUCE_MAC
#if JUCE_QUICKTIME
#define Point CarbonDummyPointName
#define Component CarbonDummyCompName
#import <QTKit/QTKit.h>
#undef Point
#undef Component
#endif
//==============================================================================


Loading…
Cancel
Save