Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."
am: 6f4b566169
* commit '6f4b5661696355d230c515a45aca2dddd8fe99b1':
Fix misc-macro-parentheses warnings in aapt and androidfw.
Change-Id: I5333078964a57c20144acb6b538205bde2782c12
This commit is contained in:
@ -6543,7 +6543,7 @@ bool ResTable::getIdmapInfo(const void* idmap, size_t sizeBytes,
|
||||
#define CHAR16_TO_CSTR(c16, len) (String8(String16(c16,len)).string())
|
||||
|
||||
#define CHAR16_ARRAY_EQ(constant, var, len) \
|
||||
((len == (sizeof(constant)/sizeof(constant[0]))) && (0 == memcmp((var), (constant), (len))))
|
||||
(((len) == (sizeof(constant)/sizeof((constant)[0]))) && (0 == memcmp((var), (constant), (len))))
|
||||
|
||||
static void print_complex(uint32_t complex, bool isFraction)
|
||||
{
|
||||
|
@ -390,12 +390,12 @@ sp<AaptFile> StringPool::createStringBlock()
|
||||
|
||||
#define ENCODE_LENGTH(str, chrsz, strSize) \
|
||||
{ \
|
||||
size_t maxMask = 1 << ((chrsz*8)-1); \
|
||||
size_t maxMask = 1 << (((chrsz)*8)-1); \
|
||||
size_t maxSize = maxMask-1; \
|
||||
if (strSize > maxSize) { \
|
||||
*str++ = maxMask | ((strSize>>(chrsz*8))&maxSize); \
|
||||
if ((strSize) > maxSize) { \
|
||||
*(str)++ = maxMask | (((strSize)>>((chrsz)*8))&maxSize); \
|
||||
} \
|
||||
*str++ = strSize; \
|
||||
*(str)++ = strSize; \
|
||||
}
|
||||
|
||||
status_t StringPool::writeStringBlock(const sp<AaptFile>& pool)
|
||||
|
Reference in New Issue
Block a user