diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-03 20:40:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-03 20:40:52 +0000 |
| commit | dbb5f5d6c4186e919fa51c019d56ea5fa8ff8b96 (patch) | |
| tree | eb1fa3e66730e7f1d56f593777f4fea15fa761f3 /tools/aapt/ResourceTable.cpp | |
| parent | e2e5b88e3ad2d18cde31f55a750e76d3d1b25185 (diff) | |
| parent | efcbaec14135c42f81e2a8f645584cf7cf542a02 (diff) | |
| download | frameworks_base-dbb5f5d6c4186e919fa51c019d56ea5fa8ff8b96.zip frameworks_base-dbb5f5d6c4186e919fa51c019d56ea5fa8ff8b96.tar.gz frameworks_base-dbb5f5d6c4186e919fa51c019d56ea5fa8ff8b96.tar.bz2 | |
am efcbaec1: Merge "Only Windows doesn\'t have %zd."
* commit 'efcbaec14135c42f81e2a8f645584cf7cf542a02':
Only Windows doesn't have %zd.
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |