diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 52b93a9454330..06eb84dfb9061 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -18,13 +18,10 @@ #include #include -// SSIZE: mingw does not have signed size_t == ssize_t. // STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary. #if !defined(_WIN32) -# define SSIZE(x) x # define STATUST(x) x #else -# define SSIZE(x) (signed size_t)x # define STATUST(x) (status_t)x #endif @@ -3040,7 +3037,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp& sp strFile = p->getTypeStringsData(); ssize_t amt = data->writeData(strFile->getData(), strFile->getSize()); if (kPrintStringMetrics) { - fprintf(stderr, "**** type strings: %zd\n", SSIZE(amt)); + fprintf(stderr, "**** type strings: %zd\n", amt); } strAmt += amt; if (amt < 0) { @@ -3050,7 +3047,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp& strFile = p->getKeyStringsData(); amt = data->writeData(strFile->getData(), strFile->getSize()); if (kPrintStringMetrics) { - fprintf(stderr, "**** key strings: %zd\n", SSIZE(amt)); + fprintf(stderr, "**** key strings: %zd\n", amt); } strAmt += amt; if (amt < 0) { @@ -3322,8 +3319,8 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp& ssize_t amt = (dest->getSize()-strStart); strAmt += amt; if (kPrintStringMetrics) { - fprintf(stderr, "**** value strings: %zd\n", SSIZE(amt)); - fprintf(stderr, "**** total strings: %zd\n", SSIZE(strAmt)); + fprintf(stderr, "**** value strings: %zd\n", amt); + fprintf(stderr, "**** total strings: %zd\n", amt); } for (pi=0; pi* indices = offsetsForString(val); ssize_t res = indices != NULL && indices->size() > 0 ? indices->itemAt(0) : -1; if (kIsDebug) { - printf("Offset for string %s: %zd (%s)\n", String8(val).string(), SSIZE(res), + printf("Offset for string %s: %zd (%s)\n", String8(val).string(), res, res >= 0 ? String8(mEntries[mEntryArray[res]].value).string() : String8()); } return res; diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index 15ec4afa52dd4..861efd5077fe2 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/XMLNode.cpp @@ -16,13 +16,10 @@ #define O_BINARY 0 #endif -// SSIZE: mingw does not have signed size_t == ssize_t. // STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary. #if !defined(_WIN32) -# define SSIZE(x) x # define STATUST(x) x #else -# define SSIZE(x) (signed size_t)x # define STATUST(x) (status_t)x #endif @@ -1426,7 +1423,7 @@ status_t XMLNode::collect_attr_strings(StringPool* outPool, idx = outPool->add(attr.name); if (kIsDebug) { printf("Adding attr %s (resid 0x%08x) to pool: idx=%zd\n", - String8(attr.name).string(), id, SSIZE(idx)); + String8(attr.name).string(), id, idx); } if (id != 0) { while ((ssize_t)outResIds->size() <= idx) { @@ -1437,7 +1434,7 @@ status_t XMLNode::collect_attr_strings(StringPool* outPool, } attr.namePoolIdx = idx; if (kIsDebug) { - printf("String %s offset=0x%08zd\n", String8(attr.name).string(), SSIZE(idx)); + printf("String %s offset=0x%08zd\n", String8(attr.name).string(), idx); } } }