| commit | dc57f4d93ad2c8dbf2ea1b031328e12fa2fac401 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri May 02 22:52:25 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri May 02 22:52:26 2014 +0000 |
| tree | a42f4739f08ca592e548efc500af46882e6be7ef | |
| parent | ccae68e47857170843934c38839c3f0323c65027 [diff] | |
| parent | 6e2c0f7010ed7b2f8504f86e662211dea608f8f9 [diff] |
Merge "logd: build breakage in git_master-nova @ 1151709"
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;