From 66793fc09bee8dec3becbecee7ab536b34b85cdc Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Fri, 29 Jan 2016 18:08:11 +0000
Subject: [PATCH] Removed a few more carbon workaround macros

---
 modules/juce_audio_formats/juce_audio_formats.cpp       | 4 ----
 modules/juce_audio_processors/juce_audio_processors.cpp | 4 ----
 modules/juce_video/juce_video.cpp                       | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/modules/juce_audio_formats/juce_audio_formats.cpp b/modules/juce_audio_formats/juce_audio_formats.cpp
index 370a084fc3..856e82019a 100644
--- a/modules/juce_audio_formats/juce_audio_formats.cpp
+++ b/modules/juce_audio_formats/juce_audio_formats.cpp
@@ -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>
diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp
index cd222c106d..dbefccbfb4 100644
--- a/modules/juce_audio_processors/juce_audio_processors.cpp
+++ b/modules/juce_audio_processors/juce_audio_processors.cpp
@@ -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
 
diff --git a/modules/juce_video/juce_video.cpp b/modules/juce_video/juce_video.cpp
index 8f60ab9da7..45a44bef5a 100644
--- a/modules/juce_video/juce_video.cpp
+++ b/modules/juce_video/juce_video.cpp
@@ -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
 
 //==============================================================================