commit e58a6e75495a4d74c0f504066390aaa42b418682
author Julian Calaby <julian.calaby@gmail.com> Mon Jun 27 22:17:03 2016 +1000
committer Erik de Castro Lopo <erikd@mega-nerd.com> Tue Jun 28 18:08:12 2016 +1000
tree 94a9473c25bc4c9faf223a8ae9e6b17ac23c8de7
parent 7394ad85b872a7cc2adaa7c39dcf81779f99bfc4

libFLAC/cpu.c: Remove a layer of cpp conditionals

src/libFLAC/cpu.c

diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c
index af9c756..a89d162 100644
--- a/src/libFLAC/cpu.c
+++ b/src/libFLAC/cpu.c
@@ -358,11 +358,10 @@
 #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 @@
 	else /* no OS AVX support */
 		x86_64_disable_avx(info);
 #endif
-#endif
 }
 
 void FLAC__cpu_info (FLAC__CPUInfo *info)