diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 16:43:59 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 16:43:59 +0000 |
| commit | aa91eb9f37577f4a7df5da83b4a6e4433f90106c (patch) | |
| tree | 77128325ff6c3a5d3466d2f21ede3818e5be885b /base/third_party | |
| parent | 2e5257e256f24e009fd5a0c20ad0730a33da7f65 (diff) | |
| download | chromium_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/third_party')
| -rw-r--r-- | base/third_party/nspr/prtime.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/base/third_party/nspr/prtime.cc b/base/third_party/nspr/prtime.cc index f1fcf26..61b7303 100644 --- a/base/third_party/nspr/prtime.cc +++ b/base/third_party/nspr/prtime.cc @@ -71,6 +71,9 @@ #include <windows.h> #elif defined(OS_MACOSX) #include <CoreFoundation/CoreFoundation.h> +#elif defined(OS_ANDROID) +#include <ctype.h> +#include "base/os_compat_android.h" // For timegm() #endif #include <errno.h> /* for EINVAL */ #include <time.h> @@ -138,10 +141,10 @@ PR_ImplodeTime(const PRExplodedTime *exploded) gregorian_date.minute = exploded->tm_min; gregorian_date.second = exploded->tm_sec; - // Compute |absolute_time| in seconds, correct for gmt and dst + // Compute |absolute_time| in seconds, correct for gmt and dst // (note the combined offset will be negative when we need to add it), then // convert to microseconds which is what PRTime expects. - CFAbsoluteTime absolute_time = + CFAbsoluteTime absolute_time = CFGregorianDateGetAbsoluteTime(gregorian_date, NULL); PRTime result = static_cast<PRTime>(absolute_time); result -= exploded->tm_params.tp_gmt_offset + |