summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/dietlibc/libpthread/pthread_cancel.c
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-06-04 18:31:57 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-06-04 18:31:57 +0000
commit09e967c2d732783b2579e4e120cd9b608404cb00 (patch)
tree8d2783a6a7e33608c6012efd6a88b8f5694df81d /mdk-stage1/dietlibc/libpthread/pthread_cancel.c
parent18fcff49d3c836697d3b75a3d01d31c700e69974 (diff)
downloaddrakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar
drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar.gz
drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar.bz2
drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar.xz
drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.zip
Merge from R9_0-AMD64, most notably:
- AMD64 support to insmod-busybox, minilibc, et al. - Sync with insmod-modutils 2.4.19 something but everyone should use dietlibc nowadays - Factor out compilation and prefix with $(DIET) for dietlibc builds - 64-bit & varargs fixes
Diffstat (limited to 'mdk-stage1/dietlibc/libpthread/pthread_cancel.c')
-rw-r--r--mdk-stage1/dietlibc/libpthread/pthread_cancel.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mdk-stage1/dietlibc/libpthread/pthread_cancel.c b/mdk-stage1/dietlibc/libpthread/pthread_cancel.c
index 4c87a3ed1..c0ae60349 100644
--- a/mdk-stage1/dietlibc/libpthread/pthread_cancel.c
+++ b/mdk-stage1/dietlibc/libpthread/pthread_cancel.c
@@ -14,14 +14,12 @@ int pthread_cancel(pthread_t th)
j=__find_thread_id(th);
if (j==-1) {
- (*(__errno_location()))=ESRCH;
- return -1;
+ return ESRCH;
}
thread = __get_thread_struct(j);
if (thread==0) {
- (*(__errno_location()))=ESRCH;
- return -1;
+ return ESRCH;
}
if (thread->cancelstate!=PTHREAD_CANCEL_DISABLE) {