aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/nptl
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-11-04 16:36:21 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-11-04 16:44:49 -0300
commit3ef5e118f2684bdc3f8e5776269557038705cefb (patch)
treea6dcc6cb48efc9f8aaef0b0827a08e0c1f080017 /sysdeps/nptl
parente4c23a029a54c8c7788eff9ca771a01cccaaa0ce (diff)
downloadglibc-3ef5e118f2684bdc3f8e5776269557038705cefb.zip
glibc-3ef5e118f2684bdc3f8e5776269557038705cefb.tar.gz
glibc-3ef5e118f2684bdc3f8e5776269557038705cefb.tar.bz2
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 <joseph@codesourcery.com> Reviewed-by: Rafal Luzynski <digitalfreak@lingonborough.com> Reviewed-by: Florian Weimer <fw@deneb.enyo.de>
Diffstat (limited to 'sysdeps/nptl')
-rw-r--r--sysdeps/nptl/pthread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
index d2fe6b7..a4ff323 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