don't remap internal-use syscall macros to nonexistent time32 syscalls

[musl] / src / time / timer_delete.c

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index 437de2e..b0bfac0 100644 (file)
--- 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);
+               __syscall(SYS_tkill, td->tid, SIGTIMER);
+               return 0;
+       }
+       return __syscall(SYS_timer_delete, t);
 }