base/time_posix.cc - Issue 10795083: Enable some parts of base that were previously disabled in base_untrusted

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: base/time_posix.cc

Issue 10795083: Enable some parts of base that were previously disabled in base_untrusted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

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

Download patch

Index: base/time_posix.cc

diff --git a/base/time_posix.cc b/base/time_posix.cc

index 5fc2c5dc3152fc03cad0fa09e1db498e9db3c834..c74cae5d15230377a01eabb7f5d85d05dbe58e73 100644

--- a/base/time_posix.cc

+++ b/base/time_posix.cc

@@ -189,7 +189,7 @@ Time Time::FromExploded(bool is_local, const Exploded& exploded) {

// TimeTicks ------------------------------------------------------------------

// FreeBSD 6 has CLOCK_MONOLITHIC but defines _POSIX_MONOTONIC_CLOCK to -1.

-#if (defined(OS_POSIX) && \

+#if (defined(OS_POSIX) && !defined(OS_NACL) && \

defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0) || \

defined(OS_BSD) || defined(OS_ANDROID)

« no previous file with comments | « base/threading/platform_thread_posix.cc ('k') | no next file » | no next file with comments »