third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h - Issue 10818025: tcmalloc: move includes for mallinfo from tcmalloc.cc to tcmalloc.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h

Issue 10818025: tcmalloc: move includes for mallinfo from tcmalloc.cc to tcmalloc.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix tcmalloc instead Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h

diff --git a/third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h b/third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h

index 7c889170bade4ae356fb7c391c2aa0d328af823d..a3f036fec52823fb523753d98771eaba45200525 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

Nico 2012/07/24 16:37:10 HAVE_STRUCT_MALLINFO etc are defined in third_part

+// 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

« no previous file with comments | « no previous file | third_party/tcmalloc/chromium/src/tcmalloc.cc » ('j') | no next file with comments »