summaryrefslogtreecommitdiff
path: root/nptl/pthread_join.c
diff options
context:
space:
mode:
Diffstat (limited to 'nptl/pthread_join.c')
-rw-r--r--nptl/pthread_join.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c
index 409fe8b210..c7ff5a393b 100644
--- a/nptl/pthread_join.c
+++ b/nptl/pthread_join.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -14,13 +14,14 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
+ <https://www.gnu.org/licenses/>. */
#include "pthreadP.h"
int
__pthread_join (pthread_t threadid, void **thread_return)
{
- return __pthread_timedjoin_ex (threadid, thread_return, NULL, true);
+ return __pthread_clockjoin_ex (threadid, thread_return, 0 /* Ignored */,
+ NULL, true);
}
weak_alias (__pthread_join, pthread_join)