diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-09 16:19:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 16:19:44 +0000 |
| commit | ed1c1193758c86773ff6b45a11db8bfc49b35d3e (patch) | |
| tree | 65668a61b298a9191b802192a4e291f00dcad8be /core/combo | |
| parent | 491055df99d9d3ebf9006f073a54292ef7724ec5 (diff) | |
| parent | 6c0fba0f989ce9755a4f4303149355dd0d4ea60d (diff) | |
| download | build-ed1c1193758c86773ff6b45a11db8bfc49b35d3e.zip build-ed1c1193758c86773ff6b45a11db8bfc49b35d3e.tar.gz build-ed1c1193758c86773ff6b45a11db8bfc49b35d3e.tar.bz2 | |
am 6c0fba0f: am ae44bb55: am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '6c0fba0f989ce9755a4f4303149355dd0d4ea60d':
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 121bba3..54f3750 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -125,12 +125,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 120f484..4267508 100644 --- a/core/combo/include/arch/freebsd-x86/AndroidConfig.h +++ b/core/combo/include/arch/freebsd-x86/AndroidConfig.h @@ -133,12 +133,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 28d0d30..35eecfe 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -138,12 +138,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 8bfbe9f..33472d2 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -138,12 +138,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 24b0da5..c68f354 100644 --- a/core/combo/include/arch/linux-ppc/AndroidConfig.h +++ b/core/combo/include/arch/linux-ppc/AndroidConfig.h @@ -128,12 +128,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 359cfb9..5761e48 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -128,12 +128,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 bbb36fc..d44a317 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -125,12 +125,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 |