projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace bad cancellation cleanup abi with a sane one
[musl]
/
src
/
thread
/
cancellation.c
diff --git
a/src/thread/cancellation.c
b/src/thread/cancellation.c
index
4976fed
..
967705a
100644
(file)
--- a/
src/thread/cancellation.c
+++ b/
src/thread/cancellation.c
@@
-1,21
+1,20
@@
#include "pthread_impl.h"
#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
+void __do_cleanup_push();
+void __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;
+ __do_cleanup_push(cb, f, x);
}
}
-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, run);
}
}
+
+static void dummy()
+{
+}
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);