mirrors/flac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Calaby 2016-06-27 22:17:03 +10:00 committed by Erik de Castro Lopo
parent 7394ad85b8
commit e58a6e7549
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libFLAC/cpu.c
View File

@ -358,11 +358,10 @@ x86_64_cpu_info (FLAC__CPUInfo *info)
#elif defined(__ANDROID__) || defined(ANDROID) #elif defined(__ANDROID__) || defined(ANDROID)
/* no need to check OS SSE support */ /* no need to check OS SSE support */
info->use_asm = true; info->use_asm = true;
#else #elif !defined FLAC__NO_ASM && FLAC__HAS_X86INTRIN
FLAC__bool x86_osxsave = false; FLAC__bool x86_osxsave = false;
FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx; FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx;
#if !defined FLAC__NO_ASM && FLAC__HAS_X86INTRIN
info->use_asm = true; info->use_asm = true;
/* http://www.sandpile.org/x86/cpuid.htm */ /* http://www.sandpile.org/x86/cpuid.htm */
@ -407,7 +406,6 @@ x86_64_cpu_info (FLAC__CPUInfo *info)
else /* no OS AVX support */ else /* no OS AVX support */
x86_64_disable_avx(info); x86_64_disable_avx(info);
#endif #endif
#endif
} }
void FLAC__cpu_info (FLAC__CPUInfo *info) void FLAC__cpu_info (FLAC__CPUInfo *info)