diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-29 18:22:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-11 11:34:17 +0100 |
| commit | 00d26a728db2814620f390b418a7d6325ce5aca6 (patch) | |
| tree | 1a08a766ac3682d979bba42bb32150b3e6b93fdc /base/time_posix.cc | |
| parent | b3a45980d5cfbb62c937045255faa29a8ffea9f3 (diff) | |
| download | external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.zip external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.gz external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.bz2 | |
Collection of all the changs to external chromium.
Time is running out, I guess we have to submit this and remember to upstream.
Rebased to chromium r53293
Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
Diffstat (limited to 'base/time_posix.cc')
| -rw-r--r-- | base/time_posix.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/time_posix.cc b/base/time_posix.cc index 2490315..f1c743d 100644 --- a/base/time_posix.cc +++ b/base/time_posix.cc @@ -79,7 +79,8 @@ Time Time::FromExploded(bool is_local, const Exploded& exploded) { if (is_local) seconds = mktime(×truct); else - seconds = timegm(×truct); + seconds = mktime(×truct); +// seconds = timegm(×truct); int64 milliseconds; // Handle overflow. Clamping the range to what mktime and timegm might @@ -147,7 +148,7 @@ void Time::Explode(bool is_local, Exploded* exploded) const { // 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(ANDROID) // static TimeTicks TimeTicks::Now() { |