diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 20:58:09 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 20:58:09 +0000 |
| commit | ab68db2dfa3e111939a207fe1e19e5b9a529fd5c (patch) | |
| tree | e51c3fb23b9d87ca5beb905c21566fe106987cfd /third_party/tcmalloc | |
| parent | 5f1615580627f51eb722d30f57a670f9bd5e4476 (diff) | |
| download | chromium_src-ab68db2dfa3e111939a207fe1e19e5b9a529fd5c.zip chromium_src-ab68db2dfa3e111939a207fe1e19e5b9a529fd5c.tar.gz chromium_src-ab68db2dfa3e111939a207fe1e19e5b9a529fd5c.tar.bz2 | |
remove redundant ifdefs
OS_CHROMEOS implies OS_LINUX, so OS_LINUX || OS_CHROMEOS can be simplified to OS_LINUX
BUG=none
Review URL: https://codereview.chromium.org/237673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/system-alloc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/tcmalloc/chromium/src/system-alloc.cc b/third_party/tcmalloc/chromium/src/system-alloc.cc index 2141d413e..d1ae71d 100644 --- a/third_party/tcmalloc/chromium/src/system-alloc.cc +++ b/third_party/tcmalloc/chromium/src/system-alloc.cc @@ -100,7 +100,7 @@ template <> bool CheckAddressBits<8 * sizeof(void*)>(uintptr_t ptr) { return true; } -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) +#if defined(OS_LINUX) && defined(__x86_64__) #define ASLR_IS_SUPPORTED #endif |