From 078c631d73cff9a7ee4b2483048d4aef8545126b Mon Sep 17 00:00:00 2001 From: Julian Calaby Date: Mon, 27 Jun 2016 22:13:30 +1000 Subject: [PATCH] libFLAC/cpu.c: Get rid of OS_IS_ANDROID function --- src/libFLAC/cpu.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c index 06a51905..1e2b98f4 100644 --- a/src/libFLAC/cpu.c +++ b/src/libFLAC/cpu.c @@ -63,12 +63,6 @@ # include /* for __get_cpuid() and __get_cpuid_max() */ #endif -#if defined(__ANDROID__) || defined(ANDROID) -#define OS_IS_ANDROID 1 -#else -#define OS_IS_ANDROID 0 -#endif - #ifdef DEBUG #include @@ -176,18 +170,15 @@ ia32_cpu_info (FLAC__CPUInfo *info) #if !defined FLAC__CPU_IA32 (void) info; return; +#elif defined(__ANDROID__) || defined(ANDROID) + /* no need to check OS SSE support */ + info->use_asm = true; + return; #else - FLAC__bool ia32_fxsr = false; FLAC__bool ia32_osxsave = false; FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx; - if (OS_IS_ANDROID) { - /* no need to check OS SSE support */ - info->use_asm = true; - return; - } - #if !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) info->use_asm = true; /* we assume a minimum of 80386 with FLAC__CPU_IA32 */ #if !FLAC__HAS_X86INTRIN @@ -367,17 +358,14 @@ x86_64_cpu_info (FLAC__CPUInfo *info) #if !defined FLAC__CPU_X86_64 (void) info; return; +#elif defined(__ANDROID__) || defined(ANDROID) + /* no need to check OS SSE support */ + info->use_asm = true; + return; #else - FLAC__bool x86_osxsave = false; FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx; - if (OS_IS_ANDROID) { - /* no need to check OS SSE support */ - info->use_asm = true; - return; - } - #if !defined FLAC__NO_ASM && FLAC__HAS_X86INTRIN info->use_asm = true;