From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 5CAB03AAA0D4; Thu, 4 Mar 2021 17:37:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CAB03AAA0D4 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] nptl: Fix __pthread_clockjoin_np64 __pthread_timedjoin_np64 hidden proto X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 01bbd25d93197db623f8bc9d5b07e6a3eef565a6 X-Git-Newrev: ddb765fc1acfc0c4ba2781844bb2f7a890f00c98 Message-Id: <20210304173719.5CAB03AAA0D4@sourceware.org> Date: Thu, 4 Mar 2021 17:37:19 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 17:37:19 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ddb765fc1acfc0c4ba2781844bb2f7a890f00c98 commit ddb765fc1acfc0c4ba2781844bb2f7a890f00c98 Author: Adhemerval Zanella Date: Wed Feb 17 11:10:52 2021 -0300 nptl: Fix __pthread_clockjoin_np64 __pthread_timedjoin_np64 hidden proto They are both implemented in libpthread instead of libc. Diff: --- nptl/pthreadP.h | 4 ++-- nptl/pthread_clockjoin.c | 2 +- nptl/pthread_timedjoin.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index d2fd0826fe..90a21ee16a 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -469,10 +469,10 @@ extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex); extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, clockid_t clockid, const struct __timespec64 *abstime); -libc_hidden_proto (__pthread_clockjoin_np64) +libpthread_hidden_proto (__pthread_clockjoin_np64) extern int __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return, const struct __timespec64 *abstime); -libc_hidden_proto (__pthread_timedjoin_np64) +libpthread_hidden_proto (__pthread_timedjoin_np64) extern int __pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex, const struct __timespec64 *abstime); diff --git a/nptl/pthread_clockjoin.c b/nptl/pthread_clockjoin.c index c55ab8bd09..7457c187fe 100644 --- a/nptl/pthread_clockjoin.c +++ b/nptl/pthread_clockjoin.c @@ -32,7 +32,7 @@ __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, } #if __TIMESIZE != 64 -libc_hidden_def (__pthread_clockjoin_np64) +libpthread_hidden_def (__pthread_clockjoin_np64) int __pthread_clockjoin_np (pthread_t threadid, void **thread_return, diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c index 282483cc49..f5d0d3d6ce 100644 --- a/nptl/pthread_timedjoin.c +++ b/nptl/pthread_timedjoin.c @@ -28,7 +28,7 @@ __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return, } #if __TIMESIZE != 64 -libc_hidden_def (__pthread_timedjoin_np64) +libpthread_hidden_def (__pthread_timedjoin_np64) int __pthread_timedjoin_np (pthread_t threadid, void **thread_return,