From 6be9d2fef218272188077404d74f50b9f2175f54 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 19 Mar 2012 11:48:12 -0700 Subject: [PATCH] Fix build break on glibc hosts. Change-Id: Ida70bec6ea972d042982428353cbbc33cde25136 --- StringPool.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/StringPool.cpp b/StringPool.cpp index b6295bd..a9941b4 100644 --- a/StringPool.cpp +++ b/StringPool.cpp @@ -213,7 +213,11 @@ status_t StringPool::addStyleSpan(size_t idx, const entry_style_span& span) return NO_ERROR; } +#ifdef __GLIBC__ +int StringPool::config_sort(const void* lhs, const void* rhs, void* state) +#else int StringPool::config_sort(void* state, const void* lhs, const void* rhs) +#endif { StringPool* pool = (StringPool*)state; const entry& lhe = pool->mEntries[pool->mEntryArray[*static_cast(lhs)]]; @@ -241,7 +245,13 @@ void StringPool::sortByConfig() NOISY(printf("SORTING STRINGS BY CONFIGURATION...\n")); // Vector::sort uses insertion sort, which is very slow for this data set. // Use quicksort instead because we don't need a stable sort here. + // For more fun, GLibC took qsort_r from BSD but then decided to swap the + // order the last two parameters. +#ifdef __GLIBC__ + qsort_r(newPosToOriginalPos.editArray(), N, sizeof(size_t), config_sort, this); +#else qsort_r(newPosToOriginalPos.editArray(), N, sizeof(size_t), this, config_sort); +#endif //newPosToOriginalPos.sort(config_sort, this); NOISY(printf("DONE SORTING STRINGS BY CONFIGURATION.\n")); -- 2.45.2