X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Ftimer_delete.c;h=c81f921a4164ca0c795f15da014e9393c1673f9c;hb=7406fdf5a18b37330de108abb0106f44ebdae2c6;hp=7c82b1831524248f3fe6dbd0320ba94545372dee;hpb=6f1414e10297b75a58a92b678444fd277abc9a4f;p=musl

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index 7c82b183..c81f921a 100644
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -1,9 +1,14 @@
 #include <time.h>
+#include <limits.h>
 #include "pthread_impl.h"
 
 int timer_delete(timer_t t)
 {
-	if ((uintptr_t)t & 1)
-		return __syscall(SYS_timer_delete, ((unsigned long)t / 2));
-	return pthread_cancel(t);
+	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, (long)t);
 }