X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Ftimer_delete.c;h=b0bfac0968a74df8c74db8bf94146085300f0794;hb=722a1ae3351a03ab25010dbebd492eced664853b;hp=d7c7670f3e2cd60a2a1ae8fdbee16d39b5b67daf;hpb=80c4dcd2535a2d7f01eb539b0358dc51b0c0e122;p=musl

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index d7c7670f..b0bfac09 100644
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -1,12 +1,14 @@
 #include <time.h>
+#include <limits.h>
 #include "pthread_impl.h"
 
 int timer_delete(timer_t t)
 {
-	if (t->thread) pthread_cancel(t->thread);
-	else {
-		if (t->timerid >= 0) __syscall(SYS_timer_delete, t->timerid);
-		free(t);
+	if ((intptr_t)t < 0) {
+		pthread_t td = (void *)((uintptr_t)t << 1);
+		a_store(&td->timer_id, td->timer_id | INT_MIN);
+		__syscall(SYS_tkill, td->tid, SIGTIMER);
+		return 0;
 	}
-	return 0;
+	return __syscall(SYS_timer_delete, t);
 }