summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamesr@google.com <jamesr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 02:38:09 +0000
committerjamesr@google.com <jamesr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 02:38:09 +0000
commit03765bae9a3f1bdde3203d66f3e005262742d192 (patch)
treecbfd99c60f60d29415800a3ffa34b005f46c7226
parent9c2ea166b99b988001a4bc98f33308a65e42485a (diff)
downloadchromium_src-03765bae9a3f1bdde3203d66f3e005262742d192.zip
chromium_src-03765bae9a3f1bdde3203d66f3e005262742d192.tar.gz
chromium_src-03765bae9a3f1bdde3203d66f3e005262742d192.tar.bz2
Add a defined(OS_LINUX) guard for the include of tcmalloc's profiler.h
This file is not mapped in to the WebKit Chromium checkout on windows and causes the compilation to fail. It's only useful on linux anyway. Review URL: http://codereview.chromium.org/1031001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41669 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/profiler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/profiler.cc b/base/profiler.cc
index 1f28a73..e291117 100644
--- a/base/profiler.cc
+++ b/base/profiler.cc
@@ -5,7 +5,7 @@
#include "base/profiler.h"
#include "base/string_util.h"
-#if defined(USE_TCMALLOC)
+#if defined(USE_TCMALLOC) && defined(OS_LINUX)
#include "third_party/tcmalloc/chromium/src/google/profiler.h"
#endif