summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2016-09-12 17:27:03 +1000
committerErik de Castro Lopo <erikd@mega-nerd.com>2016-09-12 17:27:11 +1000
commita2420c140544e2ca132434c0be53e04076a85c4d (patch)
tree1c695703d83ccd5699e3a4208136a4e677209b50
parentd1c15b4fc1212bb33d1e5e58b8a9ed7672002dcf (diff)
downloadflac-a2420c140544e2ca132434c0be53e04076a85c4d.tar.gz
cpu.c: Really fix compiler warnings
-rw-r--r--src/libFLAC/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c
index db68b8d1..c0e29ad6 100644
--- a/src/libFLAC/cpu.c
+++ b/src/libFLAC/cpu.c
@@ -82,7 +82,7 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE = 0x02000000;
static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE2 = 0x04000000;
#endif
-#if FLAC__HAS_X86INTRIN && FLAC__AVX_SUPPORTED
+#if FLAC__HAS_X86INTRIN || FLAC__AVX_SUPPORTED
/* these are flags in ECX of CPUID AX=00000001 */
static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE3 = 0x00000001;
static const unsigned FLAC__CPUINFO_IA32_CPUID_SSSE3 = 0x00000200;