drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "aapt: remove duplicate definition of ZD" am: ac2d839d7c

Browse Source 
am: 3efa1e7c17

Change-Id: Ie3109031c4a5499c6d5ff5e6ec097ab64c86d0b2
This commit is contained in:
Colin Cross
2016-09-22 22:51:08 +00:00
committed by android-build-merger
parent 3434f0f59e 3efa1e7c17
commit e43f2d4ef5
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/Resource.cpp
View File

@ -23,12 +23,8 @@
// STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary. // STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary.
#if !defined(_WIN32) #if !defined(_WIN32)
# define ZD "%zd"
# define ZD_TYPE ssize_t
# define STATUST(x) x # define STATUST(x) x
#else #else
# define ZD "%ld"
# define ZD_TYPE long
# define STATUST(x) (status_t)x # define STATUST(x) (status_t)x
#endif #endif

4
tools/aapt/StringPool.cpp
View File

@ -14,12 +14,8 @@
// SSIZE: mingw does not have signed size_t == ssize_t. // SSIZE: mingw does not have signed size_t == ssize_t.
#if !defined(_WIN32) #if !defined(_WIN32)
# define ZD "%zd"
# define ZD_TYPE ssize_t
# define SSIZE(x) x # define SSIZE(x) x
#else #else
# define ZD "%ld"
# define ZD_TYPE long
# define SSIZE(x) (signed size_t)x # define SSIZE(x) (signed size_t)x
#endif #endif