X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fcancellation.c;h=9b21764b56b0bea71300b30dedaf950248135112;hp=4976fedcb448bac52427a4dcb25bf59c333e1941;hb=b6218764ebca59ff5dae0e87b696188c8de0119e;hpb=ea343364a719add2cd8adf8a50c15bb5f9400dd8

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index 4976fedc..9b21764b 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,21 +1,20 @@
 #include "pthread_impl.h"
 
-#ifdef __pthread_register_cancel
-#undef __pthread_register_cancel
-#undef __pthread_unregister_cancel
-#define __pthread_register_cancel __pthread_register_cancel_3
-#define __pthread_unregister_cancel __pthread_unregister_cancel_3
-#endif
+static void dummy(struct __ptcb *cb)
+{
+}
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);
 
-void __pthread_register_cancel(struct __ptcb *cb)
+void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 {
-	struct pthread *self = pthread_self();
-	cb->__next = self->cancelbuf;
-	self->cancelbuf = cb;
+	cb->__f = f;
+	cb->__x = x;
+	__do_cleanup_push(cb);
 }
 
-void __pthread_unregister_cancel(struct __ptcb *cb)
+void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
-	struct pthread *self = __pthread_self();
-	self->cancelbuf = self->cancelbuf->__next;
+	__do_cleanup_pop(cb);
+	if (run) cb->__f(cb->__x);
 }