diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-11-01 11:55:57 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-11-01 11:55:57 +0100 |
| commit | 46406bc7f0a58cb2cfe7973b8c3b587a02beb74f (patch) | |
| tree | 7e3b4ffc99fe845b5c0ee8c77593f0bf8d1144cc /sysdeps/mach | |
| parent | 3c237122a91c0a782183c63e9c277ab97837b9cf (diff) | |
| parent | 37d6d0fd80143a25b0d1f2a875e2cce6504d9567 (diff) | |
Merge branch 'master-glibc' into master-glibc-2.21
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/bits/pthread-np.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/mach/hurd/bits/pthread-np.h b/sysdeps/mach/hurd/bits/pthread-np.h index 5f75e06..4487ffd 100644 --- a/sysdeps/mach/hurd/bits/pthread-np.h +++ b/sysdeps/mach/hurd/bits/pthread-np.h @@ -33,6 +33,6 @@ extern int pthread_hurd_cond_wait_np (pthread_cond_t *__restrict __cond, See hurd_thread_cancel. */ extern int pthread_hurd_cond_timedwait_np (pthread_cond_t *__restrict __cond, pthread_mutex_t *__restrict __mutex, - const struct timespec *abstime); + const struct timespec *__abstime); #endif /* bits/pthread-np.h */ |