X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fpthread.h;h=43754ddd7b47cd31b84c8c497acf0a6cad362545;hb=e6bac87d0eaab116878a04874bc5b6a3496cb938;hp=e15f25bb9f7235accfef66bab05e617905780b3f;hpb=047e434ef5fd5437a74f98f63c40a77a683f7f3f;p=musl

diff --git a/include/pthread.h b/include/pthread.h
index e15f25bb..43754ddd 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -65,7 +65,7 @@ extern "C" {
 #define PTHREAD_CANCEL_DEFERRED 0
 #define PTHREAD_CANCEL_ASYNCHRONOUS 1
 
-#define PTHREAD_CANCELLED ((void *)-1)
+#define PTHREAD_CANCELED ((void *)-1)
 
 
 #define PTHREAD_BARRIER_SERIAL_THREAD (-1)
@@ -181,9 +181,11 @@ int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
 #include <bits/pthread.h>
 
 int __setjmp(void *);
+#ifndef __pthread_register_cancel
 void __pthread_register_cancel(struct __ptcb *);
 void __pthread_unregister_cancel(struct __ptcb *);
 void __pthread_unwind_next(struct __ptcb *);
+#endif
 
 #define pthread_cleanup_push(f, x) \
 do { struct __ptcb __cb; void (*__f)(void *) = (f); void *__x = (x); \