| commit | 727aeb66865e1f8450c93404d6db5b6274e0df13 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Dec 30 21:46:54 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 30 21:46:54 2015 +0000 |
| tree | 40dc60d4fa13d8cd2346c07c6dc7fbfc3ec13f66 | |
| parent | 554630f94e07023fcb0e05c82dccd9a2e172f508 [diff] | |
| parent | ff8b8e838bb4c79bf767691be4c6a5d5583bb136 [diff] |
Merge "logd: build breakage aosp-brillo-master @ 2508494"
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;