diff options
| author | Colin Cross <ccross@android.com> | 2016-09-23 01:17:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-23 01:17:34 +0000 |
| commit | f45d261928ec69f4647f005e3cfa74a2aeddb4c2 (patch) | |
| tree | 57345806ecf89dd8b72e1dae92e87a28a2e0a9c0 | |
| parent | ba8556e53e7cb1a76f1d8ee262427690c23bcf8e (diff) | |
| parent | b62cc13c7c427b9381c9c7ffe3dcd95662698108 (diff) | |
Merge "aapt: remove duplicate definition of ZD" am: ac2d839d7c am: 3efa1e7c17 am: e43f2d4ef5
am: b62cc13c7c
Change-Id: Ieb593095a6bdc1842b95863fa2cf08ff1fb0669f
| -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 1e7875d435eb..75a316092a02 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 |