am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."

[android/aapt.git] / StringPool.h

diff --git a/StringPool.h b/StringPool.h
index 64acfd8131629fba2bcfeda9f0c9b19ee070f2a2..d5010086b2928a55adad08884c6d98ddbdd29e48 100644 (file)
--- a/StringPool.h
+++ b/StringPool.h
@@ -139,11 +139,7 @@ public:
     const Vector<size_t>* offsetsForString(const String16& val) const;
 
 private:
     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);
     static int config_sort(void* state, const void* lhs, const void* rhs);

-#endif

 
     const bool                              mUTF8;
 
 
     const bool                              mUTF8;