summaryrefslogtreecommitdiff
path: root/include/utils
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-03 20:58:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-03 20:58:29 +0000
commit3bb04bd804c3bd3ddbc28b3a36b5559a711e25b3 (patch)
tree15ae526a3c9af4f75abf1ba0189d6f076ed3a554 /include/utils
parenta01e74d4940a52f614ad27e4e4980fe2ff7d0e6f (diff)
parent6c7c6d0420ca837b81927b2f7c08cd9d92533043 (diff)
am 6c7c6d04: am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."
* commit '6c7c6d0420ca837b81927b2f7c08cd9d92533043': Only Windows doesn't have %zd.
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/Compat.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/utils/Compat.h b/include/utils/Compat.h
index ca4a8e0d8..7d9631027 100644
--- a/include/utils/Compat.h
+++ b/include/utils/Compat.h
@@ -41,12 +41,12 @@ static inline ssize_t pread64(int fd, void* buf, size_t nbytes, off64_t offset)
#define DEFFILEMODE 0666
#endif /* _WIN32 */
-#if HAVE_PRINTF_ZD
-# define ZD "%zd"
-# define ZD_TYPE ssize_t
+#if defined(_WIN32)
+#define ZD "%ld"
+#define ZD_TYPE long
#else
-# define ZD "%ld"
-# define ZD_TYPE long
+#define ZD "%zd"
+#define ZD_TYPE ssize_t
#endif
/*