diff options
| author | 2016-09-16 12:55:35 -0700 | |
|---|---|---|
| committer | 2016-09-16 12:56:21 -0700 | |
| commit | 281386df645025b497950c8b4f2e87c6bf570777 (patch) | |
| tree | f85a7254a900e70e6b7315f4cca3d3f8e88fdd48 | |
| parent | 9c08f6bb827a7980bf8a8d0f5b9c1d7342e70e86 (diff) | |
aapt: remove duplicate definition of ZD
ZD and ZD_TYPE are set by utils/Compat.h, remove them from
StringPool.cpp and Resource.cpp.
Test: m -j native
Bug: 31492149
Change-Id: I6154e4598dd1f279e348ef6c0b32d756464bda8a
| -rw-r--r-- | tools/aapt/Resource.cpp | 4 | ||||
| -rw-r--r-- | tools/aapt/StringPool.cpp | 4 |
2 files changed, 0 insertions, 8 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 diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 37a493329ade..866291a3b678 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -14,12 +14,8 @@ // SSIZE: mingw does not have signed size_t == ssize_t. #if !defined(_WIN32) -# define ZD "%zd" -# define ZD_TYPE ssize_t # define SSIZE(x) x #else -# define ZD "%ld" -# define ZD_TYPE long # define SSIZE(x) (signed size_t)x #endif |