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

Commit 281386df authored by Colin Cross's avatar Colin Cross
Browse files

aapt: remove duplicate definition of ZD 

ZD and ZD_TYPE are set by utils/Compat.h, remove them from
StringPool.cpp and Resource.cpp.

Test: m -j native
Bug: 31492149
Change-Id: I6154e4598dd1f279e348ef6c0b32d756464bda8a
parent 9c08f6bb

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