libFLAC/cpu.c: Remove a layer of cpp conditionals
authorJulian Calaby <julian.calaby@gmail.com>
Mon, 27 Jun 2016 12:17:03 +0000 (22:17 +1000)
committerErik de Castro Lopo <erikd@mega-nerd.com>
Tue, 28 Jun 2016 08:08:12 +0000 (18:08 +1000)
src/libFLAC/cpu.c

index af9c756..a89d162 100644 (file)
@@ -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)