claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build issue on OSX with GCC 4.2/Xcode.

Browse Source 
Patch-from: lvqcl <lvqcl.mail@gmail.com>
This commit is contained in:
Erik de Castro Lopo
2014-03-21 17:45:18 +11:00
parent cf55fc7bd7
commit d7e6d91fba
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libFLAC/cpu.c
View File

@@ -518,7 +518,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
#if defined _MSC_VER
#include <intrin.h> /* for __cpuid() */
#elif defined __GNUC__
#elif defined __GNUC__ && defined HAVE_CPUID_H
#include <cpuid.h> /* for __get_cpuid() and __get_cpuid_max() */
#endif
@@ -546,7 +546,7 @@ FLAC__uint32 FLAC__cpu_have_cpuid_x86(void)
return 1;
else
return 0;
# elif defined __GNUC__
# elif defined __GNUC__ && defined HAVE_CPUID_H
if (__get_cpuid_max(0, 0) != 0)
return 1;
else
@@ -564,7 +564,7 @@ void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx)
__cpuid(cpuinfo, 1);
*flags_ecx = cpuinfo[2];
*flags_edx = cpuinfo[3];
#elif defined __GNUC__
#elif defined __GNUC__ && defined HAVE_CPUID_H
FLAC__uint32 flags_eax, flags_ebx;
if (0 == __get_cpuid(1, &flags_eax, &flags_ebx, flags_ecx, flags_edx))
*flags_ecx = *flags_edx = 0;