From 2251ea40ba9e5a4340e721e1c15802fc5e405d2b Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 1 Oct 2014 10:12:25 -0700 Subject: [PATCH] Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h. Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4 --- .../include/arch/darwin-x86/AndroidConfig.h | 25 ----- .../include/arch/linux-arm/AndroidConfig.h | 44 -------- .../include/arch/linux-arm64/AndroidConfig.h | 41 ------- .../include/arch/linux-x86/AndroidConfig.h | 53 --------- .../arch/target_linux-x86/AndroidConfig.h | 43 +------- .../include/arch/windows/AndroidConfig.h | 103 ------------------ 6 files changed, 1 insertion(+), 308 deletions(-) diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index eeda5d026..eb5609cbf 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -83,21 +83,6 @@ */ #define HAVE_LOCALTIME_R 1 -/* - * Define this if we have gethostbyname_r(). - */ -/* #define HAVE_GETHOSTBYNAME_R */ - -/* - * Define this if we want to use WinSock. - */ -/* #define HAVE_WINSOCK */ - -/* - * Define this if have clock_gettime() and friends - */ -/* #define HAVE_POSIX_CLOCKS */ - /* * Endianness of the target machine. Choose one: * @@ -232,14 +217,4 @@ */ #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/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h index 1ca244c2d..4a9ec624c 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -78,21 +78,6 @@ */ #define HAVE_SYMLINKS -/* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R 1 */ - -/* - * Define this if we have gethostbyname_r(). - */ -/* #define HAVE_GETHOSTBYNAME_R */ - -/* - * Define this if we want to use WinSock. - */ -/* #define HAVE_WINSOCK */ - /* * Define this if have clock_gettime() and friends */ @@ -108,14 +93,6 @@ #define HAVE_ENDIAN_H #define HAVE_LITTLE_ENDIAN -/* - * We need to choose between 32-bit and 64-bit off_t. All of our code should - * agree on the same size. For desktop systems, use 64-bit values, - * because some of our libraries (e.g. wxWidgets) expect to be built that way. - */ -/* #define _FILE_OFFSET_BITS 64 */ -/* #define _LARGEFILE_SOURCE 1 */ - /* * Defined if we have the backtrace() call for retrieving a stack trace. * Needed for CallStack to operate; if not defined, CallStack is @@ -175,22 +152,11 @@ */ #define HAVE_LIBC_SYSTEM_PROPERTIES 1 -/* - * Define if system provides a system property server (should be - * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES). - */ -/* #define HAVE_SYSTEM_PROPERTY_SERVER */ - /* * What CPU architecture does this platform use? */ #define ARCH_ARM -/* - * Define if the size of enums is as short as possible, - */ -/* #define HAVE_SHORT_ENUMS */ - /* * sprintf() format string for shared library naming. */ @@ -261,14 +227,4 @@ */ #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/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index 8cf6c791f..c3ad5daf0 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -62,11 +62,6 @@ */ #define HAVE_TERMIO_H 1 -/* - * Define this if you build against MSVCRT.DLL - */ -/* #define HAVE_MS_C_RUNTIME */ - /* * Define this if you have sys/uio.h */ @@ -78,21 +73,6 @@ */ #define HAVE_SYMLINKS -/* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R 1 */ - -/* - * Define this if we have gethostbyname_r(). - */ -/* #define HAVE_GETHOSTBYNAME_R */ - -/* - * Define this if we want to use WinSock. - */ -/* #define HAVE_WINSOCK */ - /* * Define this if have clock_gettime() and friends */ @@ -170,22 +150,11 @@ */ #define HAVE_LIBC_SYSTEM_PROPERTIES 1 -/* - * Define if system provides a system property server (should be - * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES). - */ -/* #define HAVE_SYSTEM_PROPERTY_SERVER */ - /* * What CPU architecture does this platform use? */ #define ARCH_AARCH64 -/* - * Define if the size of enums is as short as possible, - */ -/* #define HAVE_SHORT_ENUMS */ - /* * sprintf() format string for shared library naming. */ @@ -256,14 +225,4 @@ */ #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/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 1f2d9ab38..e3bffec02 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -62,11 +62,6 @@ */ #define HAVE_TERMIO_H 1 -/* - * Define this if you build against MSVCRT.DLL - */ -/* #define HAVE_MS_C_RUNTIME */ - /* * Define this if you have sys/uio.h */ @@ -88,11 +83,6 @@ */ #define HAVE_GETHOSTBYNAME_R -/* - * Define this if we want to use WinSock. - */ -/* #define HAVE_WINSOCK */ - /* * Define this if have clock_gettime() and friends */ @@ -128,30 +118,16 @@ */ #define HAVE_SCHED_SETSCHEDULER -/* - * Add any extra platform-specific defines here. - */ - /* * Define if we have header */ #define HAVE_MALLOC_H -/* - * Define if we have Linux-style non-filesystem Unix Domain Sockets - */ - /* * What CPU architecture does this platform use? */ #define ARCH_X86 - -/* - * Define if we have Linux's inotify in . - */ -/*#define HAVE_INOTIFY 1*/ - /* * Define if we have madvise() in */ @@ -167,11 +143,6 @@ */ #define HAVE_DIRENT_D_TYPE 1 -/* - * Define if libc includes Android system properties implementation. - */ -/* #define HAVE_LIBC_SYSTEM_PROPERTIES */ - /* * Define if system provides a system property server (should be * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES). @@ -198,16 +169,6 @@ */ #define HAVE_SYS_SOCKET_H 1 -/* - * Define if the strlcpy() function exists on the system. - */ -/* #define HAVE_STRLCPY 1 */ - -/* - * Define if the BSD funopen() function exists on the system. - */ -/* #define HAVE_FUNOPEN 1 */ - /* * Define if prctl() exists */ @@ -248,18 +209,4 @@ */ #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. - */ -#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8)) -#define HAVE_GNU_QSORT_R 1 -#else -#define HAVE_GNU_QSORT_R 0 -#endif - #endif /*_ANDROID_CONFIG_H*/ diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index 260f518b3..216bb9ed5 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -48,11 +48,6 @@ */ #define HAVE_TERMIO_H 1 -/* - * Define this if you build against have Microsoft C runtime (MSVCRT.DLL) - */ -/* #define HAVE_MS_C_RUNTIME */ - /* * Define this if you have sys/uio.h */ @@ -64,21 +59,6 @@ */ #define HAVE_SYMLINKS 1 -/* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R 1 */ - -/* - * Define this if we have gethostbyname_r(). - */ -/* #define HAVE_GETHOSTBYNAME_R */ - -/* - * Define this if we want to use WinSock. - */ -/* #define HAVE_WINSOCK */ - /* * Define this if have clock_gettime() and friends * @@ -112,7 +92,7 @@ */ #define HAVE_BACKTRACE 0 -/* +/* * Defined if we have the sched_setscheduler() call */ #define HAVE_SCHED_SETSCHEDULER @@ -149,11 +129,6 @@ */ #define HAVE_MADVISE 1 -/* - * Define if we have Linux's dbus - */ -/* #define HAVE_DBUS 1 */ - /* * Define if tm struct has tm_gmtoff field */ @@ -169,12 +144,6 @@ */ #define HAVE_LIBC_SYSTEM_PROPERTIES 1 -/* - * Define if system provides a system property server (should be - * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES). - */ -/* #define HAVE_SYSTEM_PROPERTY_SERVER */ - /* * What CPU architecture does this platform use? */ @@ -250,14 +219,4 @@ */ #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/core/combo/include/arch/windows/AndroidConfig.h b/core/combo/include/arch/windows/AndroidConfig.h index c80c20142..786f95e49 100644 --- a/core/combo/include/arch/windows/AndroidConfig.h +++ b/core/combo/include/arch/windows/AndroidConfig.h @@ -111,17 +111,6 @@ #define HAVE_SYS_UIO_H #endif - -/* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R 1 */ - -/* - * Define this if we have gethostbyname_r(). - */ -/* #define HAVE_GETHOSTBYNAME_R */ - /* * Define this if we want to use WinSock. */ @@ -129,17 +118,6 @@ #define HAVE_WINSOCK #endif -/* - * Define this if your platforms implements symbolic links - * in its filesystems - */ -/* #define HAVE_SYMLINKS */ - -/* - * Define this if have clock_gettime() and friends - */ -/* #define HAVE_POSIX_CLOCKS */ - /* * Endianness of the target machine. Choose one: * @@ -168,32 +146,6 @@ */ #define HAVE_BACKTRACE 0 -/* - * Define if tm struct has tm_gmtoff field - */ -/* #define HAVE_TM_GMTOFF 1 */ - -/* - * Define if dirent struct has d_type field - */ -/* #define HAVE_DIRENT_D_TYPE 1 */ - -/* - * Define if libc includes Android system properties implementation. - */ -/* #define HAVE_LIBC_SYSTEM_PROPERTIES */ - -/* - * Define if system provides a system property server (should be - * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES). - */ -/* #define HAVE_SYSTEM_PROPERTY_SERVER */ - -/* - * Define if we have madvise() in - */ -/*#define HAVE_MADVISE 1*/ - /* * Add any extra platform-specific defines here. */ @@ -218,11 +170,6 @@ */ #define OS_PATH_SEPARATOR '\\' -/* - * Is the filesystem case sensitive? - */ -/* #define OS_CASE_SENSITIVE */ - /* * Define if exists. * Cygwin has it, but not MinGW. @@ -233,16 +180,6 @@ #define HAVE_SYS_SOCKET_H 1 #endif -/* - * Define if the strlcpy() function exists on the system. - */ -/* #define HAVE_STRLCPY 1 */ - -/* - * Define if the BSD funopen() function exists on the system. - */ -/* #define HAVE_FUNOPEN 1 */ - /* * Define if exists. * Only MinGW has it. @@ -260,49 +197,9 @@ #define S_IRGRP 0 #endif -/* - * Define if writev() exists. - */ -/* #define HAVE_WRITEV */ - -/* - * Define if exists. - */ -/* #define HAVE_STDINT_H */ - /* * Define if exists. */ #define HAVE_STDBOOL_H -/* - * Define if exists. - */ -/* #define HAVE_SCHED_H */ - -/* - * Define if pread() exists - */ -/* #define HAVE_PREAD 1 */ - -/* - * Define if we have st_mtim in struct stat - */ -/* #define HAVE_STAT_ST_MTIM 1 */ - -/* - * Define if printf() supports %zd for size_t arguments - */ -/* #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*/