summaryrefslogtreecommitdiffstats
path: root/libpthread/linuxthreads/join.c
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-09-13 02:28:34 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-09-13 02:28:34 +0000
commit07a485defae1ef578c5b3ce0d4373201948a7345 (patch)
tree2184f0f32083bd47ef3b82ad016d8d710f8f221f /libpthread/linuxthreads/join.c
parent224ca9f63688cdecd80ed01c25f5f62871fe4cfc (diff)
downloaduClibc-alpine-07a485defae1ef578c5b3ce0d4373201948a7345.tar.bz2
uClibc-alpine-07a485defae1ef578c5b3ce0d4373201948a7345.tar.xz
Merge with trunk. "So do that funky merge whiiite boy..."
Diffstat (limited to 'libpthread/linuxthreads/join.c')
-rw-r--r--libpthread/linuxthreads/join.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpthread/linuxthreads/join.c b/libpthread/linuxthreads/join.c
index 5aeec6a20..83761e199 100644
--- a/libpthread/linuxthreads/join.c
+++ b/libpthread/linuxthreads/join.c
@@ -124,7 +124,7 @@ int pthread_join(pthread_t thread_id, void ** thread_return)
extr.pu_extricate_func = join_extricate_func;
__pthread_lock(&handle->h_lock, self);
- if (invalid_handle(handle, thread_id)) {
+ if (nonexisting_handle(handle, thread_id)) {
__pthread_unlock(&handle->h_lock);
return ESRCH;
}
@@ -190,7 +190,7 @@ int pthread_detach(pthread_t thread_id)
pthread_descr th;
__pthread_lock(&handle->h_lock, NULL);
- if (invalid_handle(handle, thread_id)) {
+ if (nonexisting_handle(handle, thread_id)) {
__pthread_unlock(&handle->h_lock);
return ESRCH;
}