Fix name conflict between SoundTouch BOOL and ObjC BOOL.

2014-11-15 19:35:32 -05:00 · 2014-11-15 19:35:32 -05:00 · aae234c5d7
parent 9cbf353755
commit aae234c5d7
1 changed files with 9 additions and 0 deletions
--- 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