commit 763c4f89833ec145ac1a0c4feea4544ba631c68a
author Mark Salyzyn <salyzyn@google.com> Mon Jun 08 22:29:25 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 08 22:29:25 2015 +0000
tree 2c09eb7745e6fff6579f0b22521f7b1c37d9e18b
parent 9029809923372cebdc58b4a39af79263f854afe7
parent 57b98af5902d56495ce45f26652fa85b32572bb1

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

* commit '3c717e486246ab4eead6fc89c5eeaf90924d622f':
  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) {