Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am efcbaec1: Merge "Only Windows doesn\'t have %zd."

Browse Source 
* commit 'efcbaec14135c42f81e2a8f645584cf7cf542a02':
  Only Windows doesn't have %zd.
This commit is contained in:
Elliott Hughes
2015-04-03 20:40:52 +00:00
committed by Android Git Automerger
parent e2e5b88e3a efcbaec141
commit dbb5f5d6c4
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Resource.cpp
View File

@@ -22,7 +22,7 @@
// 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 HAVE_PRINTF_ZD #if !defined(_WIN32)
# define ZD "%zd" # define ZD "%zd"
# define ZD_TYPE ssize_t # define ZD_TYPE ssize_t
# define STATUST(x) x # define STATUST(x) x

2
tools/aapt/ResourceTable.cpp
View File

@@ -20,7 +20,7 @@
// SSIZE: mingw does not have signed size_t == ssize_t. // 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. // 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 SSIZE(x) x
# define STATUST(x) x # define STATUST(x) x
#else #else

2
tools/aapt/StringPool.cpp
View File

@@ -13,7 +13,7 @@
#include "ResourceTable.h" #include "ResourceTable.h"
// SSIZE: mingw does not have signed size_t == ssize_t. // SSIZE: mingw does not have signed size_t == ssize_t.
#if HAVE_PRINTF_ZD #if !defined(_WIN32)
# define ZD "%zd" # define ZD "%zd"
# define ZD_TYPE ssize_t # define ZD_TYPE ssize_t
# define SSIZE(x) x # define SSIZE(x) x

2
tools/aapt/XMLNode.cpp
View File

@@ -18,7 +18,7 @@
// SSIZE: mingw does not have signed size_t == ssize_t. // 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. // 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 SSIZE(x) x
# define STATUST(x) x # define STATUST(x) x
#else #else