diff options
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h | 12 | ||||
| -rw-r--r-- | third_party/tcmalloc/chromium/src/tcmalloc.cc | 12 |
2 files changed, 11 insertions, 13 deletions
diff --git a/third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h b/third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h index 7c88917..a3f036f 100644 --- a/third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h +++ b/third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h @@ -53,7 +53,17 @@ #define TC_VERSION_PATCH "" #define TC_VERSION_STRING "gperftools 2.0" -#include <stdlib.h> // for struct mallinfo, if it's defined +// For struct mallinfo, it it's defined. +#ifdef HAVE_STRUCT_MALLINFO +// Malloc can be in several places on older versions of OS X. +# if defined(HAVE_MALLOC_H) +# include <malloc.h> +# elif defined(HAVE_SYS_MALLOC_H) +# include <sys/malloc.h> +# elif defined(HAVE_MALLOC_MALLOC_H) +# include <malloc/malloc.h> +# endif +#endif // Annoying stuff for windows -- makes sure clients can import these functions #ifndef PERFTOOLS_DLL_DECL diff --git a/third_party/tcmalloc/chromium/src/tcmalloc.cc b/third_party/tcmalloc/chromium/src/tcmalloc.cc index aa29436..2ff2a3b 100644 --- a/third_party/tcmalloc/chromium/src/tcmalloc.cc +++ b/third_party/tcmalloc/chromium/src/tcmalloc.cc @@ -131,18 +131,6 @@ #include "tcmalloc_guard.h" // for TCMallocGuard #include "thread_cache.h" // for ThreadCache -// We only need malloc.h for struct mallinfo. -#ifdef HAVE_STRUCT_MALLINFO -// Malloc can be in several places on older versions of OS X. -# if defined(HAVE_MALLOC_H) -# include <malloc.h> -# elif defined(HAVE_SYS_MALLOC_H) -# include <sys/malloc.h> -# elif defined(HAVE_MALLOC_MALLOC_H) -# include <malloc/malloc.h> -# endif -#endif - #if (defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)) && !defined(WIN32_OVERRIDE_ALLOCATORS) # define WIN32_DO_PATCHING 1 #endif |