From 7b91f2383ba3c89243dfcae187fb549f9a72bd70 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 6 Dec 2016 19:37:52 +1100 Subject: [PATCH] libFLAC/cpu.c: Improve logic Only call `FLAC__cpu_have_cpuid_asm_ia32` if `FLAC__HAS_NASM` is defined. Patch-from: "lvqcl.mail" --- src/libFLAC/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c index dbfca248..6a6095f0 100644 --- a/src/libFLAC/cpu.c +++ b/src/libFLAC/cpu.c @@ -107,7 +107,7 @@ ia32_cpu_info (FLAC__CPUInfo *info) #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 +#if defined FLAC__HAS_NASM if(!FLAC__cpu_have_cpuid_asm_ia32()) return; #endif