diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-03 12:56:45 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-04-03 12:56:45 -0700 |
| commit | b12f2410c7bdbf90bd8a77b897846ee2763e3037 (patch) | |
| tree | 47038fdc39ec8491b35a3ad455e456e92775bf02 /tools | |
| parent | 64b0062a373102f83837faade20b469685758139 (diff) | |
| download | frameworks_base-b12f2410c7bdbf90bd8a77b897846ee2763e3037.zip frameworks_base-b12f2410c7bdbf90bd8a77b897846ee2763e3037.tar.gz frameworks_base-b12f2410c7bdbf90bd8a77b897846ee2763e3037.tar.bz2 | |
Only Windows doesn't have %zd.
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Resource.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/StringPool.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/XMLNode.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 36299c2..38d10cf 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -22,7 +22,7 @@ // STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary. -#if HAVE_PRINTF_ZD +#if !defined(_WIN32) # define ZD "%zd" # define ZD_TYPE ssize_t # define STATUST(x) x diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 941a288..24f8168 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -20,7 +20,7 @@ // 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 HAVE_PRINTF_ZD +#if !defined(_WIN32) # define SSIZE(x) x # define STATUST(x) x #else diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index a18e9f1..9908c44 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -13,7 +13,7 @@ #include "ResourceTable.h" // SSIZE: mingw does not have signed size_t == ssize_t. -#if HAVE_PRINTF_ZD +#if !defined(_WIN32) # define ZD "%zd" # define ZD_TYPE ssize_t # define SSIZE(x) x diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index b38b2ed..9033cf7 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/XMLNode.cpp @@ -18,7 +18,7 @@ // 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 HAVE_PRINTF_ZD +#if !defined(_WIN32) # define SSIZE(x) x # define STATUST(x) x #else |