Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e43f2d4e authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

am: 3efa1e7c

Change-Id: Ie3109031c4a5499c6d5ff5e6ec097ab64c86d0b2
parents 3434f0f5 3efa1e7c

tools/aapt/Resource.cpp

+0 −4
Original line number Diff line number Diff line
@@ -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

tools/aapt/StringPool.cpp

+0 −4
Original line number Diff line number Diff line
@@ -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