X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Ftime%2Ftimer_delete.c;h=b5f8ca196a753ee890f3197797555b56098edd54;hp=caf048954c040c36e7d98806400b687f56da0710;hb=43653c1250ad5eb5385d7e08292ad047420f8d25;hpb=680630011d38eb9f96f92b2f080cc60f38f6df21

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index caf04895..b5f8ca19 100644
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -3,10 +3,11 @@
 
 int timer_delete(timer_t t)
 {
-	if (t->thread) pthread_cancel(t->thread);
-	else {
-		__syscall(SYS_timer_delete, t->timerid);
-		free(t);
+	if ((uintptr_t)t >= 0x100000) {
+		pthread_t td = t;
+		td->delete_timer = 1;
+		__wake(&td->delete_timer, 1, 1);
+		return 0;
 	}
-	return 0;
+	return __syscall(SYS_timer_delete, (long)t);
 }