Reformatted most of the CPU stuff in system_wrappers.
BUG=
Review URL: https://webrtc-codereview.appspot.com/930025
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3142 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/system_wrappers/source/cpu_features.cc b/webrtc/system_wrappers/source/cpu_features.cc
index 41a86e3..61c1360 100644
--- a/webrtc/system_wrappers/source/cpu_features.cc
+++ b/webrtc/system_wrappers/source/cpu_features.cc
@@ -10,15 +10,13 @@
// Parts of this file derived from Chromium's base/cpu.cc.
-#include "cpu_features_wrapper.h"
+#include "system_wrappers/interface/cpu_features_wrapper.h"
-#include "typedefs.h"
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#if defined(_MSC_VER)
+#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER)
#include <intrin.h>
#endif
-#endif
+
+#include "typedefs.h"
// No CPU feature is available => straight C path.
int GetCPUInfoNoASM(CPUFeature feature) {
@@ -31,7 +29,7 @@
// Intrinsic for "cpuid".
#if defined(__pic__) && defined(__i386__)
static inline void __cpuid(int cpu_info[4], int info_type) {
- __asm__ volatile (
+ __asm__ volatile(
"mov %%ebx, %%edi\n"
"cpuid\n"
"xchg %%edi, %%ebx\n"
@@ -40,7 +38,7 @@
}
#else
static inline void __cpuid(int cpu_info[4], int info_type) {
- __asm__ volatile (
+ __asm__ volatile(
"cpuid\n"
: "=a"(cpu_info[0]), "=b"(cpu_info[1]), "=c"(cpu_info[2]), "=d"(cpu_info[3])
: "a"(info_type));