commit 57b98af5902d56495ce45f26652fa85b32572bb1
author Mark Salyzyn <salyzyn@google.com> Mon Jun 08 22:18:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 08 22:18:14 2015 +0000
tree 887846a121ba612a2d15698884bc4d95cdfe89d2
parent 19a8b33c6df65aec4890d74bdb19a023d2a6118f
parent 433d2d96b85a4a86beeff41186829d9b3713b277

am fb354cd6: am 69ecfdd5: Merge "logd: build breakage"

* commit 'fb354cd6af5bccc42ab1ecabd10fb51e698169b9':
  logd: build breakage

logd/LogKlog.cpp

diff --git a/logd/LogKlog.cpp b/logd/LogKlog.cpp
index 062ffb2..7d14648 100644
--- a/logd/LogKlog.cpp
+++ b/logd/LogKlog.cpp
@@ -83,7 +83,7 @@
 #define LESS_THAN_SIG      SIGNATURE_MASK
 #define OPEN_BRACKET_SIG   ((SIGNATURE_MASK << 1) & SIGNATURE_MASK)
 // space is one more than <digit> of 9
-#define OPEN_BRACKET_SPACE (OPEN_BRACKET_SIG | 10)
+#define OPEN_BRACKET_SPACE ((char)(OPEN_BRACKET_SIG | 10))
 
 char *log_strtok_r(char *s, char **last) {
     if (!s) {