Chromium Code Reviews| Index: base/process_util_linux.cc |
| diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc |
| index 2c2824fd77db68da521883918bc88b580e99caa2..dbe79e0fa1b9493feb948d5d483eb3b3762ed659 100644 |
| --- a/base/process_util_linux.cc |
| +++ b/base/process_util_linux.cc |
| @@ -745,10 +745,11 @@ void OnNoMemory() { |
| } // namespace |
| -#if !defined(OS_ANDROID) && !defined(USE_TCMALLOC) && \ |
| - !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \ |
| +#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \ |
| !defined(THREAD_SANITIZER) |
| +#if defined(LIBC_GLIBC) && !defined(USE_TCMALLOC) |
| + |
| extern "C" { |
| void* __libc_malloc(size_t size); |
| void* __libc_realloc(void* ptr, size_t size); |
| @@ -826,7 +827,14 @@ int posix_memalign(void** ptr, size_t alignment, size_t size) { |
| } |
| } // extern C |
| -#endif // ANDROID, TCMALLOC, *_SANITIZER |
| + |
| +#else |
| + |
| +// TODO: dlsym dance |
|
tfarina
2013/05/22 23:26:09
nit: TODO(username):
please.
Mostyn Bramley-Moore
2013/05/22 23:32:16
Done.
|
| + |
| +#endif // LIBC_GLIBC && !USE_TCMALLOC |
| + |
| +#endif // !*_SANITIZER |
| void EnableTerminationOnHeapCorruption() { |
| // On Linux, there nothing to do AFAIK. |