diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:31:39 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:31:39 +0200 |
commit | 16a92d2765c5732abb64742cb5d387148e0ac629 (patch) | |
tree | abbbadbf54f87eed25f71a312e43ce7f7cb7adfe /sysdeps/generic/pt-cond-wait.c | |
parent | 9a231435f830c459c0e214c2b99877e2ed6edb56 (diff) | |
parent | 0096579c8bea920f7c42b40ea22db621da6480a5 (diff) |
Merge commit 'refs/top-bases/t/fix_inline' into t/fix_inlinet/fix_inline
Conflicts:
sysdeps/l4/hurd/pt-sysdep.h
Diffstat (limited to 'sysdeps/generic/pt-cond-wait.c')
-rw-r--r-- | sysdeps/generic/pt-cond-wait.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sysdeps/generic/pt-cond-wait.c b/sysdeps/generic/pt-cond-wait.c index a03476d..38a2ae6 100644 --- a/sysdeps/generic/pt-cond-wait.c +++ b/sysdeps/generic/pt-cond-wait.c @@ -31,7 +31,9 @@ extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond, calling thread. On return, MUTEX will be held by the calling thread. */ int -pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex) +__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex) { return __pthread_cond_timedwait_internal (cond, mutex, 0); } + +strong_alias (__pthread_cond_wait, pthread_cond_wait); |