commit 6988e0e87f58b635e5ab9a5539a538ce84bfa566
author Mark Salyzyn <salyzyn@google.com> Fri May 02 23:03:44 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 23:03:44 2014 +0000
tree 1e41035c6cb7068ac98a0c05424a20d155baafcf
parent 955ebf70b74b70595511294684f2ea8503081b06
parent 593f2040a0c393a3ae68ffbc63be07a8db21d1f8

am 593f2040: am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit '593f2040a0c393a3ae68ffbc63be07a8db21d1f8':
  logd: build breakage in git_master-nova @ 1151709

logd/LogListener.cpp

diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
index 6ff4d3a..8186cea 100644
--- a/logd/LogListener.cpp
+++ b/logd/LogListener.cpp
@@ -103,7 +103,7 @@
     // truncated message to the logs.
 
     logbuf->log(log_id, realtime, cred->uid, cred->pid, tid, msg,
-        (n <= USHRT_MAX) ? (unsigned short) n : USHRT_MAX);
+        ((size_t) n <= USHRT_MAX) ? (unsigned short) n : USHRT_MAX);
     reader->notifyNewLog();
 
     return true;