diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-09 16:14:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 16:14:38 +0000 |
| commit | 6c0fba0f989ce9755a4f4303149355dd0d4ea60d (patch) | |
| tree | a449f52aba0f3cdcc7861b3f2ef16bdc9617b5a2 /core/combo | |
| parent | 0f2e5657d4818806a6ffc6be4069d9978b22f1e2 (diff) | |
| parent | ae44bb55bd39ba66ad3882c7e63bf188600ffe14 (diff) | |
| download | build-6c0fba0f989ce9755a4f4303149355dd0d4ea60d.zip build-6c0fba0f989ce9755a4f4303149355dd0d4ea60d.tar.gz build-6c0fba0f989ce9755a4f4303149355dd0d4ea60d.tar.bz2 | |
am ae44bb55: am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit 'ae44bb55bd39ba66ad3882c7e63bf188600ffe14':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
Diffstat (limited to 'core/combo')
9 files changed, 0 insertions, 54 deletions
diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index 012f014..44de4cd 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -132,12 +132,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: * * HAVE_ENDIAN_H -- have endian.h header we can include. diff --git a/core/combo/include/arch/freebsd-x86/AndroidConfig.h b/core/combo/include/arch/freebsd-x86/AndroidConfig.h index 6f50918..0734661 100644 --- a/core/combo/include/arch/freebsd-x86/AndroidConfig.h +++ b/core/combo/include/arch/freebsd-x86/AndroidConfig.h @@ -140,12 +140,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() */ /* #define HAVE_EPOLL */ diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h index 9257d3e..9253e7c 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -145,12 +145,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() */ #define HAVE_EPOLL diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index d649b2e..6f85555 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -145,12 +145,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() */ #define HAVE_EPOLL diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index e24f3ea..2758153 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -145,12 +145,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() */ #define HAVE_EPOLL diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index 9de1637..bfc0351 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -145,12 +145,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() */ #define HAVE_EPOLL diff --git a/core/combo/include/arch/linux-ppc/AndroidConfig.h b/core/combo/include/arch/linux-ppc/AndroidConfig.h index a12ef47..e6f9489 100644 --- a/core/combo/include/arch/linux-ppc/AndroidConfig.h +++ b/core/combo/include/arch/linux-ppc/AndroidConfig.h @@ -135,12 +135,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() */ #define HAVE_EPOLL diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 2db66a2..284210c 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -135,12 +135,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() */ #define HAVE_EPOLL diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index 25a1f5d..f55134a 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -132,12 +132,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() */ #define HAVE_EPOLL |