diff options
author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 22:25:00 +0000 |
---|---|---|
committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 22:25:00 +0000 |
commit | 4a34ce0854e16bd546f7048dc9364441b62d7ea1 (patch) | |
tree | 9ce5e2fb380834cad7ec8f64d7d15f965bd8c752 /base/time_posix.cc | |
parent | 1de04bb69e44c7f2d62fb553c0b7e1c9ec6501b3 (diff) | |
download | chromium_src-4a34ce0854e16bd546f7048dc9364441b62d7ea1.zip chromium_src-4a34ce0854e16bd546f7048dc9364441b62d7ea1.tar.gz chromium_src-4a34ce0854e16bd546f7048dc9364441b62d7ea1.tar.bz2 |
Port some of the base module to FreeBSD. Extracted from
http://codereview.chromium.org/172032.
The patch is contributed by Ben Laurie of Google.
Original review URL: http://codereview.chromium.org/180037
R=wtc
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/183016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time_posix.cc')
-rw-r--r-- | base/time_posix.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/time_posix.cc b/base/time_posix.cc index 66f41d3..c64f8e7 100644 --- a/base/time_posix.cc +++ b/base/time_posix.cc @@ -143,9 +143,10 @@ void Time::Explode(bool is_local, Exploded* exploded) const { } // TimeTicks ------------------------------------------------------------------ - -#if defined(OS_POSIX) && \ - defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 +// FreeBSD 6 has CLOCK_MONOLITHIC but defines _POSIX_MONOTONIC_CLOCK to -1. +#if (defined(OS_POSIX) && \ + defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0) || \ + defined(OS_FREEBSD) // static TimeTicks TimeTicks::Now() { |