diff options
| author | Raphael <raphael@google.com> | 2011-10-27 17:01:31 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2011-10-27 17:11:21 -0700 |
| commit | f51125d8429ffa71c57ba6fbdca9effc72642a9b (patch) | |
| tree | f94891383e3cd48374f02bff435b0a3ca783bd90 /tools/aapt/StringPool.cpp | |
| parent | e87d2da0b4e44051edbee4a4339f846eba9d3a36 (diff) | |
AAPT fix printf %zd crash on Windows.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.
SDK bugs: 20395, 20986
Change-Id: I5b8ac36749263205a19f1448b1aaca90d5a2e06d
Diffstat (limited to 'tools/aapt/StringPool.cpp')
| -rw-r--r-- | tools/aapt/StringPool.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index d067d59006c6..9a0a1c46251b 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -8,6 +8,14 @@ #include <utils/ByteOrder.h> +#if HAVE_PRINTF_ZD +# define ZD "%zd" +# define ZD_TYPE ssize_t +#else +# define ZD "%ld" +# define ZD_TYPE long +#endif + #define NOISY(x) //x void strcpy16_htod(uint16_t* dst, const uint16_t* src) @@ -30,7 +38,7 @@ void printStringPool(const ResStringPool* pool) str = String8(pool->stringAt(s, &len)).string(); } - printf("String #%zd: %s\n", s, str); + printf("String #" ZD ": %s\n", (ZD_TYPE) s, str); } } |