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 /chrome/app/chrome_exe_main_gtk.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 'chrome/app/chrome_exe_main_gtk.cc')
| -rw-r--r-- | chrome/app/chrome_exe_main_gtk.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/app/chrome_exe_main_gtk.cc b/chrome/app/chrome_exe_main_gtk.cc index cd2edcb..0ed9e15 100644 --- a/chrome/app/chrome_exe_main_gtk.cc +++ b/chrome/app/chrome_exe_main_gtk.cc @@ -17,12 +17,11 @@ extern "C" { int ChromeMain(int argc, const char** argv); -#if defined(LINUX_USE_TCMALLOC) +#if defined(OS_LINUX) && defined(USE_TCMALLOC) int tc_set_new_mode(int mode); -#endif // defined(LINUX_USE_TCMALLOC) - +#endif // defined(OS_LINUX) && defined(USE_TCMALLOC) } int main(int argc, const char** argv) { @@ -35,7 +34,7 @@ int main(int argc, const char** argv) { // dependency on TCMalloc. Really, we ought to have our allocator shim code // implement this EnableTerminationOnOutOfMemory() function. Whateverz. This // works for now. -#if defined(LINUX_USE_TCMALLOC) +#if defined(OS_LINUX) && defined(USE_TCMALLOC) // For tcmalloc, we need to tell it to behave like new. tc_set_new_mode(1); #endif @@ -45,9 +44,5 @@ int main(int argc, const char** argv) { // keep it. // base::AtExitManager exit_manager; -#if defined(GOOGLE_CHROME_BUILD) - // TODO(tc): init crash reporter -#endif - return ChromeMain(argc, argv); } |