third_party/tcmalloc/chromium/src/tests/memalign_unittest.cc - Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

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/tests/memalign_unittest.cc

Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« third_party/tcmalloc/chromium/src/page_heap.cc ('K') | « third_party/tcmalloc/chromium/src/tests/malloc_hook_test.cc ('k') | third_party/tcmalloc/chromium/src/tests/page_heap_test.cc » ('j') | third_party/tcmalloc/chromium/src/windows/port.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/tests/memalign_unittest.cc

===================================================================

--- third_party/tcmalloc/chromium/src/tests/memalign_unittest.cc (revision 87277)

+++ third_party/tcmalloc/chromium/src/tests/memalign_unittest.cc (working copy)

@@ -49,6 +49,7 @@

#include <unistd.h> // for getpagesize()

#endif

#include "tcmalloc.h" // must come early, to pick up posix_memalign

+#include <assert.h>

#include <stdlib.h> // defines posix_memalign

#include <stdio.h> // for the printf at the end

#ifdef HAVE_STDINT_H

@@ -57,8 +58,13 @@

#ifdef HAVE_UNISTD_H

#include <unistd.h> // for getpagesize()

#endif

-#ifdef HAVE_MALLOC_H

-#include <malloc.h>

+// Malloc can be in several places on older versions of OS X.

+#if defined(HAVE_MALLOC_H)

+#include <malloc.h> // for memalign() and valloc()

+#elif defined(HAVE_MALLOC_MALLOC_H)

+#include <malloc/malloc.h>

+#elif defined(HAVE_SYS_MALLOC_H)

+#include <sys/malloc.h>

#endif

#include "base/basictypes.h"

#include "base/logging.h"