summaryrefslogtreecommitdiff
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2016-09-22 21:55:27 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-22 21:55:27 +0000
commit3efa1e7c1773e6c2c4955a28c8ae6576a95ddd14 (patch)
tree8c7d24e977b8dab7e4e84a9b2942f24dc5ead580 /tools/aapt/Resource.cpp
parent659cdfef7597a57c8167794e7bf499a348804fdb (diff)
parentac2d839d7c8fe58696439b04d3e66382888d22dc (diff)
Merge "aapt: remove duplicate definition of ZD"
am: ac2d839d7c Change-Id: I7f2388c9f0cd649ef79db41c67a4f07cbb18a3c9
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r--tools/aapt/Resource.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 34fdf6cba3e2..cf7f0e8788ca 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -23,12 +23,8 @@
// STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary.
#if !defined(_WIN32)
-# define ZD "%zd"
-# define ZD_TYPE ssize_t
# define STATUST(x) x
#else
-# define ZD "%ld"
-# define ZD_TYPE long
# define STATUST(x) (status_t)x
#endif