X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fcancellation.c;h=ab7eebcc02a43e5fc75b315acb98ac7f5b137f8f;hb=65db6bf5ea1f27ec2cddd6423868baeff05cc719;hp=b02cdfb093cc528413cc79f1384f19418335b0d6;hpb=5f37fc132a8f41994f37b6712feb2d4fd34c2be0;p=musl

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index b02cdfb0..ab7eebcc 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,23 +1,23 @@
 #include "pthread_impl.h"
 
-static void dummy(struct __ptcb *cb)
-{
-}
-weak_alias(dummy, __pthread_do_unwind);
-weak_alias(dummy, __pthread_do_register);
-weak_alias(dummy, __pthread_do_unregister);
+void __do_cleanup_push();
+void __do_cleanup_pop();
 
-void __pthread_unwind_next(struct __ptcb *cb)
+void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 {
-	__pthread_do_unwind(cb);
+	cb->__f = f;
+	cb->__x = x;
+	__do_cleanup_push(cb, f, x);
 }
 
-void __pthread_register_cancel(struct __ptcb *cb)
+void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
-	__pthread_do_register(cb);
+	__do_cleanup_pop(cb, run);
+	if (run) cb->__f(cb->__x);
 }
 
-void __pthread_unregister_cancel(struct __ptcb *cb)
+static void dummy()
 {
-	__pthread_do_unregister(cb);
 }
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);