commit ed42d38cf1f400463fcaae77a32e9862fb3c84e4
author Mark Salyzyn <salyzyn@google.com> Wed Dec 30 21:49:50 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 30 21:49:50 2015 +0000
tree c347e595604d42613c8ae5113d459b98e13f3084
parent 4c99c6fbdea33546ebf87ccae50590d7795f6bbc
parent ee89403835dca301ae1bce044c7595cbe6f6e0c7

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

* commit '727aeb66865e1f8450c93404d6db5b6274e0df13':
  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;