commit c54c420b8827b9d90ec1d0e8ccb4453bb176ebb4
author Elliott Hughes <enh@google.com> Fri Apr 03 20:40:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 03 20:40:56 2015 +0000
tree 0fd025292fb9dbcf1907d478cab826be21d0543b
parent 7acc42c4aca7d670fd7d11dab6169ccd17811503
parent 67cc400a81576cada2d7978745dce86ef7695b96

am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."

* commit '7c1945254ea3ae6ddb7fafb7d1a03b347ec76c91':
  Only Windows doesn't have %zd.

include/utils/Compat.h

diff --git a/include/utils/Compat.h b/include/utils/Compat.h
index ca4a8e0..7d96310 100644
--- a/include/utils/Compat.h
+++ b/include/utils/Compat.h
@@ -41,12 +41,12 @@
 #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
 
 /*