diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 20:53:22 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 20:53:22 +0000 |
| commit | 1e932118a2ad13c144f958e46899b535c7bc0bdd (patch) | |
| tree | 447007c281c03aeafb4505ff49f453c0d2c6f612 /base/time_posix.cc | |
| parent | 56af67211dafd93bc12756655e20b66b527da7e1 (diff) | |
| download | chromium_src-1e932118a2ad13c144f958e46899b535c7bc0bdd.zip chromium_src-1e932118a2ad13c144f958e46899b535c7bc0bdd.tar.gz chromium_src-1e932118a2ad13c144f958e46899b535c7bc0bdd.tar.bz2 | |
Upstream process and thread related code.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7247015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time_posix.cc')
| -rw-r--r-- | base/time_posix.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/time_posix.cc b/base/time_posix.cc index a2ea5ae..f83a9656 100644 --- a/base/time_posix.cc +++ b/base/time_posix.cc @@ -163,7 +163,7 @@ Time Time::FromExploded(bool is_local, const Exploded& exploded) { // 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) || defined(OS_OPENBSD) + defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_ANDROID) // static TimeTicks TimeTicks::Now() { |