From 3ef5e118f2684bdc3f8e5776269557038705cefb Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Mon, 4 Nov 2019 16:36:21 -0300 Subject: nptl: Fix niggles with pthread_clockjoin_np Joseph Myers spotted[1] that 69ca4b54c151cec42ccca5e05790efc1a8206b47 added pthread_clockjoin_np to sysdeps/nptl/pthread.h but not to its hppa-specific equivalent sysdeps/unix/sysv/linux/hppa/pthread.h. Rafal Luzynski spotted[2] typos in the NEWS entry and manual updates too. Florian Weimer spotted[3] that the clockid parameter was not using a reserved identifier in pthread.h. [1] https://sourceware.org/ml/libc-alpha/2019-11/msg00016.html [2] https://sourceware.org/ml/libc-alpha/2019-11/msg00019.html [3] https://sourceware.org/ml/libc-alpha/2019-11/msg00022.html Reviewed-by: Joseph Myers Reviewed-by: Rafal Luzynski Reviewed-by: Florian Weimer --- sysdeps/nptl/pthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sysdeps/nptl') diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index d2fe6b7479..a4ff323b76 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -272,7 +272,7 @@ extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return, This function is a cancellation point and therefore not marked with __THROW. */ extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return, - clockid_t clockid, + clockid_t __clockid, const struct timespec *__abstime); #endif -- cgit 1.4.1