summaryrefslogtreecommitdiffstats
path: root/base/os_compat_android.cc
diff options
context:
space:
mode:
authorzhenyu.liang@intel.com <zhenyu.liang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 12:00:47 +0000
committerzhenyu.liang@intel.com <zhenyu.liang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 12:00:47 +0000
commitfa1e7c2a31fc0d7bb53b433e583e95ac9692edc1 (patch)
tree1a93595799a924854a8fa61ec4ad6b19c07ca51a /base/os_compat_android.cc
parent1a84980ff8a75eb32558255ce8ef0d2a5baff6e2 (diff)
downloadchromium_src-fa1e7c2a31fc0d7bb53b433e583e95ac9692edc1.zip
chromium_src-fa1e7c2a31fc0d7bb53b433e583e95ac9692edc1.tar.gz
chromium_src-fa1e7c2a31fc0d7bb53b433e583e95ac9692edc1.tar.bz2
Eliminate build warnings in base/ for Android x64
This CL fixes format strings of printf and type conversions that cause compilation warnings while building Android x64. BUG=346626 Review URL: https://codereview.chromium.org/185423006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/os_compat_android.cc')
-rw-r--r--base/os_compat_android.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/os_compat_android.cc b/base/os_compat_android.cc
index ec221e4..dc7922a0 100644
--- a/base/os_compat_android.cc
+++ b/base/os_compat_android.cc
@@ -41,8 +41,8 @@ int futimes(int fd, const struct timeval tv[2]) {
// We replicate the behaviour of timegm() when the result overflows time_t.
time_t timegm(struct tm* const t) {
// time_t is signed on Android.
- static const time_t kTimeMax = ~(1 << (sizeof(time_t) * CHAR_BIT - 1));
- static const time_t kTimeMin = (1 << (sizeof(time_t) * CHAR_BIT - 1));
+ static const time_t kTimeMax = ~(1L << (sizeof(time_t) * CHAR_BIT - 1));
+ static const time_t kTimeMin = (1L << (sizeof(time_t) * CHAR_BIT - 1));
time64_t result = timegm64(t);
if (result < kTimeMin || result > kTimeMax)
return -1;