diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:31:08 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:31:08 +0000 |
| commit | 61a9b2d8a766f0eb9e790385939589797bac37f2 (patch) | |
| tree | 5d96266683dc64fc6b37e6839f4ed909a9922db7 /base/process_util_linux.cc | |
| parent | 00d721c144d35882dfaf24b3869e95a8d6404ee5 (diff) | |
| download | chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.zip chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.tar.gz chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.tar.bz2 | |
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
Diffstat (limited to 'base/process_util_linux.cc')
| -rw-r--r-- | base/process_util_linux.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index 29147f1..45e719c 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -513,8 +513,7 @@ void OnNoMemory() { } // namespace extern "C" { - -#if !defined(LINUX_USE_TCMALLOC) +#if !defined(USE_TCMALLOC) extern "C" { void* __libc_malloc(size_t size); @@ -539,7 +538,7 @@ void* __libc_memalign(size_t alignment, size_t size); // for this in process_util_unittest.cc. // // If we are using tcmalloc, then the problem is moot since tcmalloc handles -// this for us. Thus this code is in a !defined(LINUX_USE_TCMALLOC) block. +// this for us. Thus this code is in a !defined(USE_TCMALLOC) block. // // We call the real libc functions in this code by using __libc_malloc etc. // Previously we tried using dlsym(RTLD_NEXT, ...) but that failed depending on @@ -590,7 +589,7 @@ int posix_memalign(void** ptr, size_t alignment, size_t size) { return 0; } -#endif // !defined(LINUX_USE_TCMALLOC) +#endif // !defined(USE_TCMALLOC) } // extern C void EnableTerminationOnOutOfMemory() { |