diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-05-27 16:04:21 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-05-27 16:04:21 -0700 |
| commit | 5fb629a2126665c4c24c599626233dfc61be5db9 (patch) | |
| tree | 5a821a55ffbe85f1c7b0932b4aba6f644876aea8 /libcutils | |
| parent | 70ca8dcb0b1753778ac373a16c9b0f275ee14ce9 (diff) | |
| parent | e845c04f1247c5ea5631fd2acb2d1b7774a86a14 (diff) | |
| download | system_core-5fb629a2126665c4c24c599626233dfc61be5db9.tar.gz system_core-5fb629a2126665c4c24c599626233dfc61be5db9.tar.bz2 system_core-5fb629a2126665c4c24c599626233dfc61be5db9.zip | |
resolve merge conflicts of e845c04 to nyc-dev-plus-aosp
Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/strdup8to16.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcutils/strdup8to16.c b/libcutils/strdup8to16.c index 63e5ca48d..c23cf8b9a 100644 --- a/libcutils/strdup8to16.c +++ b/libcutils/strdup8to16.c @@ -27,7 +27,7 @@ #define UTF16_REPLACEMENT_CHAR 0xfffd /* Clever trick from Dianne that returns 1-4 depending on leading bit sequence*/ -#define UTF8_SEQ_LENGTH(ch) (((0xe5000000 >> ((ch >> 3) & 0x1e)) & 3) + 1) +#define UTF8_SEQ_LENGTH(ch) (((0xe5000000 >> (((ch) >> 3) & 0x1e)) & 3) + 1) /* note: macro expands to multiple lines */ #define UTF8_SHIFT_AND_MASK(unicode, byte) \ |