From 61a9b2d8a766f0eb9e790385939589797bac37f2 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Fri, 26 Feb 2010 00:31:08 +0000 Subject: Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define. BUG=36687 TEST=about:tcmalloc, etc, works when tcmalloc is enabled on Linux. Review URL: http://codereview.chromium.org/660118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40080 0039d316-1c4b-4281-b951-d872f2087c98 --- base/leak_annotations.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'base/leak_annotations.h') diff --git a/base/leak_annotations.h b/base/leak_annotations.h index f3d3677..8b5c2ad 100644 --- a/base/leak_annotations.h +++ b/base/leak_annotations.h @@ -5,7 +5,9 @@ #ifndef BASE_LEAK_ANNOTATIONS_H_ #define BASE_LEAK_ANNOTATIONS_H_ -#if defined(LINUX_USE_TCMALLOC) +#include "build/build_config.h" + +#if defined(OS_LINUX) && defined(USE_TCMALLOC) #include "third_party/tcmalloc/chromium/src/google/heap-checker.h" -- cgit v1.1