diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 20:15:32 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 20:15:32 +0200 |
commit | cbe8b6f603fbea1d64e3570f299a2bf25adfa6fc (patch) | |
tree | a62a92aded65b2e0834a4d72701415ed3cca4299 /sysdeps/unix/sysv/linux/pthread_getcpuclockid.c | |
parent | d6a8ab3c9097ce211e9aa7780ddd31b4f62d380f (diff) | |
parent | 0b113e90a20146a2783f7cb2f3e7de716b892d5f (diff) |
Merge branch 't/tls' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps/unix/sysv/linux/pthread_getcpuclockid.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/pthread_getcpuclockid.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c b/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c index 3ec1a5e73e..5fa232330e 100644 --- a/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c +++ b/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c @@ -1,5 +1,5 @@ /* pthread_getcpuclockid -- Get POSIX clockid_t for a pthread_t. Linux version - Copyright (C) 2000-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -24,9 +24,7 @@ int -pthread_getcpuclockid (threadid, clockid) - pthread_t threadid; - clockid_t *clockid; +pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid) { struct pthread *pd = (struct pthread *) threadid; |