summaryrefslogtreecommitdiffstats
path: root/base/time_posix.cc
diff options
context:
space:
mode:
authormichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:43:59 +0000
committermichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:43:59 +0000
commitaa91eb9f37577f4a7df5da83b4a6e4433f90106c (patch)
tree77128325ff6c3a5d3466d2f21ede3818e5be885b /base/time_posix.cc
parent2e5257e256f24e009fd5a0c20ad0730a33da7f65 (diff)
downloadchromium_src-aa91eb9f37577f4a7df5da83b4a6e4433f90106c.zip
chromium_src-aa91eb9f37577f4a7df5da83b4a6e4433f90106c.tar.gz
chromium_src-aa91eb9f37577f4a7df5da83b4a6e4433f90106c.tar.bz2
Upstream misc changes for android.
BUG= TEST= Review URL: http://codereview.chromium.org/7701014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time_posix.cc')
-rw-r--r--base/time_posix.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/base/time_posix.cc b/base/time_posix.cc
index f83a9656..30dd380 100644
--- a/base/time_posix.cc
+++ b/base/time_posix.cc
@@ -13,8 +13,16 @@
#include "base/basictypes.h"
#include "base/logging.h"
+#if defined(OS_ANDROID)
+#include "base/os_compat_android.h"
+#endif
+
namespace base {
+#if defined(OS_ANDROID)
+#define _POSIX_MONOTONIC_CLOCK 1
+#endif
+
struct timespec TimeDelta::ToTimeSpec() const {
int64 microseconds = InMicroseconds();
time_t seconds = 0;