diff options
| author | Colin Cross <ccross@android.com> | 2016-09-22 22:51:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 22:51:08 +0000 |
| commit | e43f2d4ef5516a0bb87a0f50bf438da8f5619a2a (patch) | |
| tree | 08ee18e01c5c1bba966d411aef0336a7503f3560 /tools/aapt/Resource.cpp | |
| parent | 3434f0f59e498f189c3de1df0f6394be64dbf29f (diff) | |
| parent | 3efa1e7c1773e6c2c4955a28c8ae6576a95ddd14 (diff) | |
Merge "aapt: remove duplicate definition of ZD" am: ac2d839d7c
am: 3efa1e7c17
Change-Id: Ie3109031c4a5499c6d5ff5e6ec097ab64c86d0b2
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 4 |
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 |