am 4e53c59d: am 48d145c1: Merge "Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC."

* commit '4e53c59db205bcb991000bf540241eb5d3b99bef':
  Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC.
This commit is contained in:
Narayan Kamath 2014-03-05 13:31:12 +00:00 committed by Android Git Automerger
commit ffce5ede0b

View File

@ -243,7 +243,6 @@ int pthread_attr_setstackaddr(pthread_attr_t*, void*) __nonnull((1)); /* depreca
// TODO: Remove them once chromium_org / NFC have switched over.
int pthread_cond_timedwait_monotonic_np(pthread_cond_t*, pthread_mutex_t*, const struct timespec*);
int pthread_cond_timedwait_monotonic(pthread_cond_t*, pthread_mutex_t*, const struct timespec*);
#define HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC 1
int pthread_cond_timedwait_relative_np(pthread_cond_t*, pthread_mutex_t*, const struct timespec*) /* TODO: __attribute__((deprecated("use pthread_cond_timedwait instead")))*/;
#define HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE 1 /* TODO: stop defining this to push LP32 off this API sooner. */