Merge "Fix length of pattern." DO NOT MERGE.

[android/aapt.git] / StringPool.cpp

diff --git a/StringPool.cpp b/StringPool.cpp
index d067d59006c66140f88339f6ea717bf0dcc05f8c..9a0a1c46251bf406e5fa598f79f887b0e1271e11 100644 (file)
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -8,6 +8,14 @@
 
 #include <utils/ByteOrder.h>
 
 
 #include <utils/ByteOrder.h>
 

+#if HAVE_PRINTF_ZD
+#  define ZD "%zd"
+#  define ZD_TYPE ssize_t
+#else
+#  define ZD "%ld"
+#  define ZD_TYPE long
+#endif
+

 #define NOISY(x) //x
 
 void strcpy16_htod(uint16_t* dst, const uint16_t* src)
 #define NOISY(x) //x
 
 void strcpy16_htod(uint16_t* dst, const uint16_t* src)


@@ -30,7 +38,7 @@ void printStringPool(const ResStringPool* pool)
             str = String8(pool->stringAt(s, &len)).string();
         }
 
             str = String8(pool->stringAt(s, &len)).string();
         }
 

-        printf("String #%zd: %s\n", s, str);
+        printf("String #" ZD ": %s\n", (ZD_TYPE) s, str);

     }
 }
 
     }
 }