diff options
| author | oparviai <oparviai@f3a24b6a-cf45-0410-b55a-8c22e2698227> | 2014-01-07 22:24:28 +0400 |
|---|---|---|
| committer | oparviai <oparviai@f3a24b6a-cf45-0410-b55a-8c22e2698227> | 2014-01-07 22:24:28 +0400 |
| commit | 41ce77b7c7b6a639c37516a6cd8e36f42c2c8902 (patch) | |
| tree | 6e4214a5192400d53e329a00a82fa2ed0f53fd8d | |
| parent | 71b9d1308324e259d18ebeaa710e034dab55fcc5 (diff) | |
Apple compatibility fixes
| -rw-r--r-- | include/STTypes.h | 6 | ||||
| -rw-r--r-- | source/SoundTouch/cpu_detect_x86.cpp | 23 |
2 files changed, 17 insertions, 12 deletions
diff --git a/include/STTypes.h b/include/STTypes.h index 46da0fe..63950e1 100644 --- a/include/STTypes.h +++ b/include/STTypes.h @@ -63,7 +63,11 @@ typedef unsigned long ulong; #ifndef _WINDEF_
// if these aren't defined already by Windows headers, define now
- typedef int BOOL;
+#if defined(__APPLE__)
+ typedef signed char BOOL;
+#else
+ typedef int BOOL;
+#endif
#define FALSE 0
#define TRUE 1
diff --git a/source/SoundTouch/cpu_detect_x86.cpp b/source/SoundTouch/cpu_detect_x86.cpp index c30476c..55be6ed 100644 --- a/source/SoundTouch/cpu_detect_x86.cpp +++ b/source/SoundTouch/cpu_detect_x86.cpp @@ -42,19 +42,20 @@ #include "cpu_detect.h"
#include "STTypes.h"
-#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
- #if defined(__GNUC__) && defined(__i386__)
- // gcc
- #include "cpuid.h"
- #elif defined(_M_IX86)
- // windows non-gcc
- #include <intrin.h>
- #define bit_MMX (1 << 23)
- #define bit_SSE (1 << 25)
- #define bit_SSE2 (1 << 26)
- #endif
+#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
+ #if defined(__GNUC__) && defined(__i386__)
+ // gcc
+ #include "cpuid.h"
+ #elif defined(_M_IX86)
+ // windows non-gcc
+ #include <intrin.h>
+ #endif
+
+ #define bit_MMX (1 << 23)
+ #define bit_SSE (1 << 25)
+ #define bit_SSE2 (1 << 26)
#endif
|