diff options
| author | Colin Cross <ccross@android.com> | 2016-09-22 23:04:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 23:04:06 +0000 |
| commit | b62cc13c7c427b9381c9c7ffe3dcd95662698108 (patch) | |
| tree | 3312d2d2ecbbc1fabe709c794ec83258d0633b6b /tools/aapt/Resource.cpp | |
| parent | c1f00b916fd4a04ebcdfc86b243dddfecbacb878 (diff) | |
| parent | e43f2d4ef5516a0bb87a0f50bf438da8f5619a2a (diff) | |
Merge "aapt: remove duplicate definition of ZD" am: ac2d839d7c am: 3efa1e7c17
am: e43f2d4ef5
Change-Id: I71e7bfd44396aa2a7d79ba983bcc71d7684a36c1
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 696120c88ae1..3e8abb121c42 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 |