Merge "Remove a tautology from <bits/threads_inlines.h>." am: 511ad0f5db

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2454910

Change-Id: Ibdaf44cb1d81966d018bbac141523234d46733c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-02-24 23:00:51 +00:00 committed by Automerger Merge Worker
commit d876e380a4

View file

@ -103,12 +103,10 @@ __BIONIC_THREADS_INLINE int mtx_lock(mtx_t* __mtx) {
return __bionic_thrd_error(pthread_mutex_lock(__mtx));
}
#if __ANDROID_API__ >= 21
__BIONIC_THREADS_INLINE int mtx_timedlock(mtx_t* __mtx,
const struct timespec* __timeout) {
return __bionic_thrd_error(pthread_mutex_timedlock(__mtx, __timeout));
}
#endif
__BIONIC_THREADS_INLINE int mtx_trylock(mtx_t* __mtx) {
return __bionic_thrd_error(pthread_mutex_trylock(__mtx));