X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fcancellation.c;h=ab7eebcc02a43e5fc75b315acb98ac7f5b137f8f;hp=6dfee53971328100eeca643a975f6fe58ea93a48;hb=e7655ed37bc9c2d79d921af4f287ee5cf2788661;hpb=730bee725a770b543181424b52203dd1634ab5d1

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