summaryrefslogtreecommitdiff
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2015-04-03 20:58:25 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-03 20:58:25 +0000
commitdda35c37ead316d671c16a168ffdb9c4b3321e4d (patch)
treeb0b7771766179dfe66a90ff13bb276385abcc21e /tools/aapt/Resource.cpp
parentb7f9aca713dccde48ac040a1e6b8b7f281e910f0 (diff)
parent66d9451273c4a3775b6b63a0e4b7027bd2eae65d (diff)
am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."
* commit '66d9451273c4a3775b6b63a0e4b7027bd2eae65d': Only Windows doesn't have %zd.
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r--tools/aapt/Resource.cpp2
1 files changed, 1 insertions, 1 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