Merge "Remove declaration of pthread_cond_timeout_np." am: adc8d34137

am: 45588044be

* commit '45588044be26939024317f164ff53098ff2bd553':
  Remove declaration of pthread_cond_timeout_np.

Change-Id: I6377985e80f6a36e0c2b94fd2275b5a8ce33c794
This commit is contained in:
Elliott Hughes 2016-04-29 15:22:21 +00:00 committed by android-build-merger
commit 124f8a64db

View file

@ -286,7 +286,6 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t*, int);
// Bionic additions that are deprecated even in the 32-bit ABI.
int pthread_cond_timedwait_relative_np(pthread_cond_t*, pthread_mutex_t*, const struct timespec*) __attribute__((deprecated("use pthread_cond_timedwait instead")));
int pthread_cond_timeout_np(pthread_cond_t*, pthread_mutex_t*, unsigned) __attribute__((deprecated("use pthread_cond_timedwait instead")));
int pthread_mutex_lock_timeout_np(pthread_mutex_t*, unsigned) __attribute__((deprecated("use pthread_mutex_timedlock instead")));