diff options
| author | 2015-04-03 20:58:25 +0000 | |
|---|---|---|
| committer | 2015-04-03 20:58:25 +0000 | |
| commit | dda35c37ead316d671c16a168ffdb9c4b3321e4d (patch) | |
| tree | b0b7771766179dfe66a90ff13bb276385abcc21e | |
| parent | b7f9aca713dccde48ac040a1e6b8b7f281e910f0 (diff) | |
| parent | 66d9451273c4a3775b6b63a0e4b7027bd2eae65d (diff) | |
am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."
* commit '66d9451273c4a3775b6b63a0e4b7027bd2eae65d':
Only Windows doesn't have %zd.
| -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 36299c2c3a5b..38d10cf6529b 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 941a2884e2a6..24f8168cf79e 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 a18e9f191941..9908c44c6d1f 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 d2cd2d64246c..6902a3036ca4 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 |