Bug 812667 - Make soundtouch compile properly if cpuid.h is not present. r=khuey

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)

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)