From aae234c5d7a19cfec9bdedc07e3914f942a91b59 Mon Sep 17 00:00:00 2001
From: comex <comexk@gmail.com>
Date: Sat, 15 Nov 2014 19:35:32 -0500
Subject: [PATCH] Fix name conflict between SoundTouch BOOL and ObjC BOOL.

---
 Source/Core/AudioCommon/OpenALStream.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h
index 5c8488a469..a8fbd8a1f2 100644
--- a/Source/Core/AudioCommon/OpenALStream.h
+++ b/Source/Core/AudioCommon/OpenALStream.h
@@ -26,9 +26,18 @@
 #include <AL/alext.h>
 #endif
 
+#ifdef __APPLE__
+// Avoid conflict with objc.h (on Windows, ST uses the system BOOL type, so this doesn't work)
+#define BOOL SoundTouch_BOOL
+#endif
+
 #include <soundtouch/SoundTouch.h>
 #include <soundtouch/STTypes.h>
 
+#ifdef __APPLE__
+#undef BOOL
+#endif
+
 // 16 bit Stereo
 #define SFX_MAX_SOURCE          1
 #define OAL_MAX_BUFFERS         32