summaryrefslogtreecommitdiffstats
path: root/base/cpu.cc
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 07:08:53 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 07:08:53 +0000
commitd1811bc49ddbef8d66eb809834a0ccd68e138be0 (patch)
treec4073c941564315925555c9a0fb2c210bd2e4c0e /base/cpu.cc
parent1d12bbadf1ef9efeccb8d3215e846e90bf6bdc7e (diff)
downloadchromium_src-d1811bc49ddbef8d66eb809834a0ccd68e138be0.zip
chromium_src-d1811bc49ddbef8d66eb809834a0ccd68e138be0.tar.gz
chromium_src-d1811bc49ddbef8d66eb809834a0ccd68e138be0.tar.bz2
Fix base::CPU detection.
ARCH_CPU_X86_FAMILY was never being defined, causing base::CPU::Initialize to be a no-op. BUG= TEST= Review URL: http://codereview.chromium.org/9836125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/cpu.cc')
-rw-r--r--base/cpu.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/base/cpu.cc b/base/cpu.cc
index f45e966..a077834 100644
--- a/base/cpu.cc
+++ b/base/cpu.cc
@@ -1,17 +1,19 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/cpu.h"
+#include <string.h>
+
+#include "build/build_config.h"
+
#if defined(ARCH_CPU_X86_FAMILY)
#if defined(_MSC_VER)
#include <intrin.h>
#endif
#endif
-#include <string.h>
-
namespace base {
CPU::CPU()