From 4a6b384f607feed3755cfcbcdfded55fc2ccce82 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 19 Mar 2012 14:07:26 -0700 Subject: Provide portable wrapper for qsort_r. qsort_r() is declared differently on BSD and GNU libc and may be absent on other platforms. Provide qsort_r_compat() which should work everywhere. Change-Id: I17a9026573b1ed971ff7d79895e7eb41ba108807 --- include/arch/darwin-x86/AndroidConfig.h | 10 +++++++ include/arch/freebsd-x86/AndroidConfig.h | 10 +++++++ include/arch/linux-arm/AndroidConfig.h | 10 +++++++ include/arch/linux-ppc/AndroidConfig.h | 10 +++++++ include/arch/linux-sh/AndroidConfig.h | 10 +++++++ include/arch/linux-x86/AndroidConfig.h | 10 +++++++ include/arch/target_linux-x86/AndroidConfig.h | 10 +++++++ include/arch/windows/AndroidConfig.h | 10 +++++++ include/cutils/qsort_r_compat.h | 39 +++++++++++++++++++++++++++ 9 files changed, 119 insertions(+) create mode 100644 include/cutils/qsort_r_compat.h (limited to 'include') diff --git a/include/arch/darwin-x86/AndroidConfig.h b/include/arch/darwin-x86/AndroidConfig.h index f79f3649..48f8d9a8 100644 --- a/include/arch/darwin-x86/AndroidConfig.h +++ b/include/arch/darwin-x86/AndroidConfig.h @@ -305,4 +305,14 @@ */ #define HAVE_PRINTF_ZD 1 +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 1 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 0 + #endif /*_ANDROID_CONFIG_H*/ diff --git a/include/arch/freebsd-x86/AndroidConfig.h b/include/arch/freebsd-x86/AndroidConfig.h index a8176f4b..4bc55597 100644 --- a/include/arch/freebsd-x86/AndroidConfig.h +++ b/include/arch/freebsd-x86/AndroidConfig.h @@ -363,4 +363,14 @@ */ #define HAVE_PRINTF_ZD 1 +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 1 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 0 + #endif /*_ANDROID_CONFIG_H*/ diff --git a/include/arch/linux-arm/AndroidConfig.h b/include/arch/linux-arm/AndroidConfig.h index b8e87135..233752b3 100644 --- a/include/arch/linux-arm/AndroidConfig.h +++ b/include/arch/linux-arm/AndroidConfig.h @@ -361,4 +361,14 @@ */ #define HAVE_PRINTF_ZD 1 +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 0 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 0 + #endif /* _ANDROID_CONFIG_H */ diff --git a/include/arch/linux-ppc/AndroidConfig.h b/include/arch/linux-ppc/AndroidConfig.h index 774c458a..ae2569bf 100644 --- a/include/arch/linux-ppc/AndroidConfig.h +++ b/include/arch/linux-ppc/AndroidConfig.h @@ -323,4 +323,14 @@ */ #define HAVE_PREAD 1 +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 0 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 1 + #endif /*_ANDROID_CONFIG_H*/ diff --git a/include/arch/linux-sh/AndroidConfig.h b/include/arch/linux-sh/AndroidConfig.h index cdfa2ac9..818b6282 100644 --- a/include/arch/linux-sh/AndroidConfig.h +++ b/include/arch/linux-sh/AndroidConfig.h @@ -366,4 +366,14 @@ */ #define HAVE_PRINTF_ZD 1 +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 0 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 0 + #endif /* _ANDROID_CONFIG_H */ diff --git a/include/arch/linux-x86/AndroidConfig.h b/include/arch/linux-x86/AndroidConfig.h index 65216997..e1ba3ed2 100644 --- a/include/arch/linux-x86/AndroidConfig.h +++ b/include/arch/linux-x86/AndroidConfig.h @@ -333,4 +333,14 @@ */ #define HAVE_PRINTF_ZD 1 +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 0 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 1 + #endif /*_ANDROID_CONFIG_H*/ diff --git a/include/arch/target_linux-x86/AndroidConfig.h b/include/arch/target_linux-x86/AndroidConfig.h index 9efb81a6..ab538923 100644 --- a/include/arch/target_linux-x86/AndroidConfig.h +++ b/include/arch/target_linux-x86/AndroidConfig.h @@ -350,4 +350,14 @@ */ #define HAVE_PRINTF_ZD 1 +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 0 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 0 + #endif /* _ANDROID_CONFIG_H */ diff --git a/include/arch/windows/AndroidConfig.h b/include/arch/windows/AndroidConfig.h index 445e7541..0274da54 100644 --- a/include/arch/windows/AndroidConfig.h +++ b/include/arch/windows/AndroidConfig.h @@ -338,4 +338,14 @@ */ /* #define HAVE_PRINTF_ZD 1 */ +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 0 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 0 + #endif /*_ANDROID_CONFIG_H*/ diff --git a/include/cutils/qsort_r_compat.h b/include/cutils/qsort_r_compat.h new file mode 100644 index 00000000..479a1ab3 --- /dev/null +++ b/include/cutils/qsort_r_compat.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Provides a portable version of qsort_r, called qsort_r_compat, which is a + * reentrant variant of qsort that passes a user data pointer to its comparator. + * This implementation follows the BSD parameter convention. + */ + +#ifndef _LIBS_CUTILS_QSORT_R_COMPAT_H +#define _LIBS_CUTILS_QSORT_R_COMPAT_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +void qsort_r_compat(void* base, size_t nel, size_t width, void* thunk, + int (*compar)(void*, const void* , const void* )); + +#ifdef __cplusplus +} +#endif + +#endif // _LIBS_CUTILS_QSORT_R_COMPAT_H -- cgit v1.2.3