rework langinfo code for ABI compat and for use by time code

[musl] / src / time / timer_delete.c

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index 437de2e..b5f8ca1 100644 (file)
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -3,11 +3,11 @@
 
 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 ((uintptr_t)t >= 0x100000) {
+               pthread_t td = t;
+               td->delete_timer = 1;
+               __wake(&td->delete_timer, 1, 1);
+               return 0;
+       }
+       return __syscall(SYS_timer_delete, (long)t);
 }