third_party/tcmalloc/chromium/src/base/cycleclock.h - Issue 9310021: [NOT TO COMMIT!] Merge Chromium-specific changes in tcmalloc thru. the original gperftools r136.

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/base/cycleclock.h

Issue 9310021: [NOT TO COMMIT!] Merge Chromium-specific changes in tcmalloc thru. the original gperftools r136. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fixed some build inhibitor. Created 8 years, 11 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

Index: third_party/tcmalloc/chromium/src/base/cycleclock.h

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

index c704e1dae645f7b5827fd21392613436314b7edc..0ce1638612cb152a0d3f9d0273aa17bf13360e6d 100644

--- a/third_party/tcmalloc/chromium/src/base/cycleclock.h

+++ b/third_party/tcmalloc/chromium/src/base/cycleclock.h

@@ -67,8 +67,10 @@ extern "C" uint64 __rdtsc();

#pragma intrinsic(__rdtsc)

#endif

#if defined(ARMV3) || defined(__mips__)

+#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#endif

+#endif

// NOTE: only i386 and x86_64 have been well tested.

// PPC, sparc, alpha, and ia64 are based on

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