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

Commit efcbaec1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Only Windows doesn't have %zd."

parents 64b0062a b12f2410

tools/aapt/Resource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


// STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary.



#if HAVE_PRINTF_ZD

#if !defined(_WIN32)

#  define ZD "%zd"

#  define ZD_TYPE ssize_t

#  define STATUST(x) x

tools/aapt/ResourceTable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


// SSIZE: mingw does not have signed size_t == ssize_t.

// STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary.

#if HAVE_PRINTF_ZD

#if !defined(_WIN32)

#  define SSIZE(x) x

#  define STATUST(x) x

#else

tools/aapt/StringPool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "ResourceTable.h"



// SSIZE: mingw does not have signed size_t == ssize_t.

#if HAVE_PRINTF_ZD

#if !defined(_WIN32)

#  define ZD "%zd"

#  define ZD_TYPE ssize_t

#  define SSIZE(x) x

tools/aapt/XMLNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


// SSIZE: mingw does not have signed size_t == ssize_t.

// STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary.

#if HAVE_PRINTF_ZD

#if !defined(_WIN32)

#  define SSIZE(x) x

#  define STATUST(x) x

#else