X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Ftimer_delete.c;h=7c97eeb1a1d8340fd07f9f045f1964680a18697d;hb=debadaa238e90fce897b467a9efefcbbc0155d06;hp=437de2e06a32926cdb71ef3709f420f23eb83146;hpb=3990c5c6a40440cdb14746ac080d0ecf8d5d6733;p=musl

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index 437de2e0..7c97eeb1 100644
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -1,13 +1,14 @@
 #include <time.h>
+#include <limits.h>
 #include "pthread_impl.h"
 
 int timer_delete(timer_t t)
 {
-	pthread_t td = 0;
-	int r;
-	if ((uintptr_t)t & 1) t = (void *)((unsigned long)t / 2);
-	else td = t, t = td->result;
-	r = __syscall(SYS_timer_delete, (long)t);
-	if (td) pthread_cancel(td);
-	return r;
+	if ((intptr_t)t < 0) {
+		pthread_t td = (void *)((uintptr_t)t << 1);
+		a_store(&td->timer_id, td->timer_id | INT_MIN);
+		__wake(&td->timer_id, 1, 1);
+		return 0;
+	}
+	return __syscall(SYS_timer_delete, t);
 }