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/os_compat_android.h | |
| 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/os_compat_android.h')
| -rw-r--r-- | base/os_compat_android.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/base/os_compat_android.h b/base/os_compat_android.h index fb69efa..af6e167 100644 --- a/base/os_compat_android.h +++ b/base/os_compat_android.h @@ -8,6 +8,7 @@ #include <fcntl.h> #include <sys/types.h> +#include <time64.h> #include <utime.h> // Not implemented in Bionic. See platform_file_android.cc. @@ -23,4 +24,9 @@ inline int lockf(int fd, int cmd, off_t ignored_len) { return flock(fd, cmd); } +// Android has only timegm64() and no timegm(). +inline time_t timegm(struct tm* const tmp) { + return static_cast<time_t>(timegm64(tmp)); +} + #endif // BASE_OS_COMPAT_ANDROID_H_ |