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 060dc6811c8bba5a4ff07821135a6e1b0f96bd06..16050b2711c3a65d1a9d6b44fc5b5a4391021acd 100644 (file)
--- a/StringPool.h
+++ b/StringPool.h
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 
 #include <ctype.h>
 #include <errno.h>
 

-#include <expat.h>
+#include <libexpat/expat.h>

 
 using namespace android;
 
 
 using namespace android;
 


@@ -139,7 +139,7 @@ public:
     const Vector<size_t>* offsetsForString(const String16& val) const;
 
 private:
     const Vector<size_t>* offsetsForString(const String16& val) const;
 
 private:

-    static int config_sort(const size_t* lhs, const size_t* rhs, void* state);
+    static int config_sort(void* state, const void* lhs, const void* rhs);

 
     const bool                              mUTF8;
 
 
     const bool                              mUTF8;