From 93ac2a58903ce27b76d18d1be44566da75333ff7 Mon Sep 17 00:00:00 2001 From: Paul Adenot Date: Fri, 16 Nov 2012 16:47:01 -0800 Subject: [PATCH] Bug 812667 - Make soundtouch compile properly if cpuid.h is not present. r=khuey --- media/libsoundtouch/moz-libsoundtouch.patch | 2 +- media/libsoundtouch/src/cpu_detect_x86.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/libsoundtouch/moz-libsoundtouch.patch b/media/libsoundtouch/moz-libsoundtouch.patch index 8eb21f016fd8..6523f7c66d80 100644 --- a/media/libsoundtouch/moz-libsoundtouch.patch +++ b/media/libsoundtouch/moz-libsoundtouch.patch @@ -475,7 +475,7 @@ unchanged: - - #if defined(__GNUC__) && defined(__i386__) - // gcc -+ #if defined(__GNUC__) ++ #if defined(__GNUC__) && defined (HAVE_CPUID_H) + // gcc and clang #include "cpuid.h" #elif defined(_M_IX86) diff --git a/media/libsoundtouch/src/cpu_detect_x86.cpp b/media/libsoundtouch/src/cpu_detect_x86.cpp index b3af0e9786e0..a42008e096b8 100644 --- a/media/libsoundtouch/src/cpu_detect_x86.cpp +++ b/media/libsoundtouch/src/cpu_detect_x86.cpp @@ -43,7 +43,7 @@ #include "STTypes.h" #if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS) - #if defined(__GNUC__) + #if defined(__GNUC__) && defined (HAVE_CPUID_H) // gcc and clang #include "cpuid.h" #elif defined(_M_IX86)