From e6243e176bc5a6d7c716d2abd0a019967973c4ad Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Mon, 3 Mar 2014 19:31:10 +0000 Subject: [PATCH] Stop defining HAVE_TIMEDWAIT_MONOTONIC. We no longer provide this function in bionic. All callers should be moved over to pthread_condattr_setclock(). Change-Id: Iccd3384b40de423f7d5f9521b6d8073bf8bdea42 --- core/combo/include/arch/darwin-x86/AndroidConfig.h | 6 ------ core/combo/include/arch/freebsd-x86/AndroidConfig.h | 6 ------ core/combo/include/arch/linux-arm/AndroidConfig.h | 6 ------ core/combo/include/arch/linux-arm64/AndroidConfig.h | 6 ------ core/combo/include/arch/linux-mips/AndroidConfig.h | 6 ------ core/combo/include/arch/linux-mips64/AndroidConfig.h | 6 ------ core/combo/include/arch/linux-ppc/AndroidConfig.h | 6 ------ core/combo/include/arch/linux-x86/AndroidConfig.h | 6 ------ core/combo/include/arch/target_linux-x86/AndroidConfig.h | 6 ------ 9 files changed, 54 deletions(-) diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index 012f014bef..44de4cdbce 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -131,12 +131,6 @@ */ /* #define HAVE_POSIX_CLOCKS */ -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -/* #define HAVE_TIMEDWAIT_MONOTONIC */ - /* * Endianness of the target machine. Choose one: * diff --git a/core/combo/include/arch/freebsd-x86/AndroidConfig.h b/core/combo/include/arch/freebsd-x86/AndroidConfig.h index 6f50918a49..0734661c1d 100644 --- a/core/combo/include/arch/freebsd-x86/AndroidConfig.h +++ b/core/combo/include/arch/freebsd-x86/AndroidConfig.h @@ -139,12 +139,6 @@ */ #define HAVE_POSIX_CLOCKS -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -/* #define HAVE_TIMEDWAIT_MONOTONIC */ - /* * Define this if we have linux style epoll() */ diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h index 9257d3e53d..9253e7c50e 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -144,12 +144,6 @@ */ #define HAVE_POSIX_CLOCKS -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -#define HAVE_TIMEDWAIT_MONOTONIC - /* * Define this if we have linux style epoll() */ diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index d649b2e62d..6f8555530a 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -144,12 +144,6 @@ */ #define HAVE_POSIX_CLOCKS -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -#define HAVE_TIMEDWAIT_MONOTONIC - /* * Define this if we have linux style epoll() */ diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index e24f3ea3d5..2758153fde 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -144,12 +144,6 @@ */ #define HAVE_POSIX_CLOCKS -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -#define HAVE_TIMEDWAIT_MONOTONIC - /* * Define this if we have linux style epoll() */ diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index 9de1637e70..bfc0351bcd 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -144,12 +144,6 @@ */ #define HAVE_POSIX_CLOCKS -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -#define HAVE_TIMEDWAIT_MONOTONIC - /* * Define this if we have linux style epoll() */ diff --git a/core/combo/include/arch/linux-ppc/AndroidConfig.h b/core/combo/include/arch/linux-ppc/AndroidConfig.h index a12ef470ec..e6f9489277 100644 --- a/core/combo/include/arch/linux-ppc/AndroidConfig.h +++ b/core/combo/include/arch/linux-ppc/AndroidConfig.h @@ -134,12 +134,6 @@ */ /*#define HAVE_POSIX_CLOCKS*/ -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -/* #define HAVE_TIMEDWAIT_MONOTONIC */ - /* * Define this if we have linux style epoll() */ diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 2db66a2662..284210c6af 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -134,12 +134,6 @@ */ /*#define HAVE_POSIX_CLOCKS*/ -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -/* #define HAVE_TIMEDWAIT_MONOTONIC */ - /* * Define this if we have linux style epoll() */ diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index 25a1f5d414..f55134a135 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -131,12 +131,6 @@ */ #define HAVE_POSIX_CLOCKS -/* - * Define this if we have pthread_cond_timedwait_monotonic() and - * clock_gettime(CLOCK_MONOTONIC). - */ -#define HAVE_TIMEDWAIT_MONOTONIC - /* * Define this if we have linux style epoll() */