diff options
| author | comex <comexk@gmail.com> | 2014-11-15 19:35:32 -0500 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2014-11-25 00:27:13 -0500 |
| commit | aae234c5d7a19cfec9bdedc07e3914f942a91b59 (patch) | |
| tree | a93d841bf695a229527ce5f69152cda71bafbdd7 /Source | |
| parent | 9cbf353755bb64605a189de13b45ddc8477a102e (diff) | |
Fix name conflict between SoundTouch BOOL and ObjC BOOL.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/AudioCommon/OpenALStream.h | 9 |
1 files changed, 9 insertions, 0 deletions
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 |