From e58a6e75495a4d74c0f504066390aaa42b418682 Mon Sep 17 00:00:00 2001 From: Julian Calaby Date: Mon, 27 Jun 2016 22:17:03 +1000 Subject: [PATCH] libFLAC/cpu.c: Remove a layer of cpp conditionals --- src/libFLAC/cpu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c index af9c7565..a89d1627 100644 --- a/src/libFLAC/cpu.c +++ b/src/libFLAC/cpu.c @@ -358,11 +358,10 @@ x86_64_cpu_info (FLAC__CPUInfo *info) #elif defined(__ANDROID__) || defined(ANDROID) /* no need to check OS SSE support */ info->use_asm = true; -#else +#elif !defined FLAC__NO_ASM && FLAC__HAS_X86INTRIN FLAC__bool x86_osxsave = false; FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx; -#if !defined FLAC__NO_ASM && FLAC__HAS_X86INTRIN info->use_asm = true; /* http://www.sandpile.org/x86/cpuid.htm */ @@ -407,7 +406,6 @@ x86_64_cpu_info (FLAC__CPUInfo *info) else /* no OS AVX support */ x86_64_disable_avx(info); #endif -#endif } void FLAC__cpu_info (FLAC__CPUInfo *info)