| Index: third_party/tcmalloc/chromium/src/malloc_hook.cc
|
| ===================================================================
|
| --- third_party/tcmalloc/chromium/src/malloc_hook.cc (revision 41940)
|
| +++ third_party/tcmalloc/chromium/src/malloc_hook.cc (working copy)
|
| @@ -423,7 +423,7 @@
|
| return result;
|
| }
|
|
|
| -# endif // defined(__x86_64__)
|
| +# endif
|
|
|
| // We use do_mmap64 abstraction to put MallocHook::InvokeMmapHook
|
| // calls right into mmap and mmap64, so that the stack frames in the caller's
|
| @@ -472,7 +472,7 @@
|
| return result;
|
| }
|
|
|
| -#endif // !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)
|
| +#endif
|
|
|
| extern "C" int munmap(void* start, size_t length) __THROW {
|
| MallocHook::InvokeMunmapHook(start, length);
|
| @@ -501,26 +501,4 @@
|
| return result;
|
| }
|
|
|
| -/*static*/void* MallocHook::UnhookedMMap(void *start, size_t length, int prot,
|
| - int flags, int fd, off_t offset) {
|
| - return do_mmap64(start, length, prot, flags, fd, offset);
|
| -}
|
| -
|
| -/*static*/int MallocHook::UnhookedMUnmap(void *start, size_t length) {
|
| - return sys_munmap(start, length);
|
| -}
|
| -
|
| -#else // defined(__linux) &&
|
| - // (defined(__i386__) || defined(__x86_64__) || defined(__PPC__))
|
| -
|
| -/*static*/void* MallocHook::UnhookedMMap(void *start, size_t length, int prot,
|
| - int flags, int fd, off_t offset) {
|
| - return mmap(start, length, prot, flags, fd, offset);
|
| -}
|
| -
|
| -/*static*/int MallocHook::UnhookedMUnmap(void *start, size_t length) {
|
| - return munmap(start, length);
|
| -}
|
| -
|
| -#endif // defined(__linux) &&
|
| - // (defined(__i386__) || defined(__x86_64__) || defined(__PPC__))
|
| +#endif
|
|
|