diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:44:23 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:44:23 +0200 |
| commit | a2b0f2e1864f03084138a105e1d5f2cf86a62425 (patch) | |
| tree | 1bfe09513168993ce36a56ddd605053b653f1c35 /nptl/pthreadP.h | |
| parent | 4372dc7eaaa81fc04554626b7f02c9759a04a65b (diff) | |
| download | glibc-a2b0f2e1864f03084138a105e1d5f2cf86a62425.tar.gz | |
nptl: Move pthread_mutex_trylock, __pthread_mutex_trylock into libc
The symbols were moved using scripts/move-symbol-to-libc.py.
__pthread_mutex_trylock is used to implement mtx_timedlock,
which still resides in libpthread, so add a GLIBC_2.34 version
for it, to match the existing GLIBC_2.0 version.
Diffstat (limited to 'nptl/pthreadP.h')
| -rw-r--r-- | nptl/pthreadP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 0def617109..8432c0ebe7 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -396,6 +396,7 @@ libc_hidden_proto (__pthread_mutex_init) extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); libc_hidden_proto (__pthread_mutex_destroy) extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex); +libc_hidden_proto (__pthread_mutex_trylock) extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); libc_hidden_proto (__pthread_mutex_lock) extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, @@ -576,7 +577,6 @@ libc_hidden_proto (__pthread_sigmask); #if IS_IN (libpthread) -hidden_proto (__pthread_mutex_trylock) hidden_proto (__pthread_rwlock_unlock) hidden_proto (__pthread_testcancel) hidden_proto (__pthread_mutexattr_init) |