commit cb43c7cc16feda19d700ac5e4c2474c3951bda5b
author Mark Salyzyn <salyzyn@google.com> Wed Dec 30 21:51:30 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 30 21:51:30 2015 +0000
tree 7c5435a44808459226f38d501bafa6fc32ffdb37
parent 5d7ae910ceb99b467b2bd53ab11985860321e3dc
parent ed42d38cf1f400463fcaae77a32e9862fb3c84e4

Merge "logd: build breakage aosp-brillo-master @ 2508494" am: 727aeb6686
am: d9748c26d5

* commit 'd9748c26d5f99704f09800d219afeb64c50330fa':
  logd: build breakage aosp-brillo-master @ 2508494

logd/LogKlog.cpp

diff --git a/logd/LogKlog.cpp b/logd/LogKlog.cpp
index ba0b6e5..9690489 100644
--- a/logd/LogKlog.cpp
+++ b/logd/LogKlog.cpp
@@ -286,7 +286,7 @@
     memset(&tm, 0, sizeof(tm));
     tm.tm_isdst = -1;
     localtime_r(&now, &tm);
-    if ((tm.tm_gmtoff < 0) && ((-tm.tm_gmtoff) > real.tv_sec)) {
+    if ((tm.tm_gmtoff < 0) && ((-tm.tm_gmtoff) > (long)real.tv_sec)) {
         real = log_time::EPOCH;
     } else {
         real.tv_sec += tm.tm_gmtoff;