Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev

[android/aapt.git] / StringPool.h

diff --git a/StringPool.h b/StringPool.h
index 64acfd8131629fba2bcfeda9f0c9b19ee070f2a2..16050b2711c3a65d1a9d6b44fc5b5a4391021acd 100644 (file)
--- a/StringPool.h
+++ b/StringPool.h
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <expat.h>
+#include <libexpat/expat.h>
 
 using namespace android;
 
@@ -139,11 +139,7 @@ public:
     const Vector<size_t>* offsetsForString(const String16& val) const;
 
 private:
-#ifdef __GLIBC__
-    static int config_sort(const void* lhs, const void* rhs, void* state);
-#else
     static int config_sort(void* state, const void* lhs, const void* rhs);
-#endif
 
     const bool                              mUTF8;