commit 078c631d73cff9a7ee4b2483048d4aef8545126b
author Julian Calaby <julian.calaby@gmail.com> Mon Jun 27 22:13:30 2016 +1000
committer Erik de Castro Lopo <erikd@mega-nerd.com> Tue Jun 28 18:08:12 2016 +1000
tree 73eb12a834552d50529f676c809f6ee110c3bdd7
parent 828e33b38ff9bd0eb425c9720109203ffe777238

libFLAC/cpu.c: Get rid of OS_IS_ANDROID function

src/libFLAC/cpu.c

diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c
index 06a5190..1e2b98f 100644
--- a/src/libFLAC/cpu.c
+++ b/src/libFLAC/cpu.c
@@ -63,12 +63,6 @@
 #  include <cpuid.h> /* 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 <stdio.h>
 
@@ -176,18 +170,15 @@
 #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 @@
 #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;