Index: third_party/tcmalloc/vendor/src/heap-checker.cc |
=================================================================== |
--- third_party/tcmalloc/vendor/src/heap-checker.cc (revision 92996) |
+++ third_party/tcmalloc/vendor/src/heap-checker.cc (working copy) |
@@ -52,7 +52,7 @@ |
#include <time.h> |
#include <assert.h> |
-#ifdef HAVE_LINUX_PTRACE_H |
+#if defined(HAVE_LINUX_PTRACE_H) && !defined(__native_client__) |
#include <linux/ptrace.h> |
#endif |
#ifdef HAVE_SYS_SYSCALL_H |
@@ -278,10 +278,6 @@ |
static const int heap_checker_info_level = 0; |
//---------------------------------------------------------------------- |
-// Cancel our InitialMallocHook_* if present. |
-static void CancelInitialMallocHooks(); // defined below |
- |
-//---------------------------------------------------------------------- |
// HeapLeakChecker's own memory allocator that is |
// independent of the normal program allocator. |
//---------------------------------------------------------------------- |
@@ -1473,7 +1469,7 @@ |
IgnoredObjectsMap; |
} |
if (!ignored_objects->insert(make_pair(AsInt(ptr), object_size)).second) { |
- RAW_LOG(FATAL, "Object at %p is already being ignored", ptr); |
+ RAW_LOG(WARNING, "Object at %p is already being ignored", ptr); |
} |
} |
} |