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

diff --git a/include/pthread.h b/include/pthread.h
index e15f25bb..44a71019 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)
@@ -76,8 +76,13 @@ int pthread_detach(pthread_t);
 void pthread_exit(void *);
 int pthread_join(pthread_t, void **);
 
+#ifdef __GNUC__
+__attribute__((const))
+#endif
 pthread_t pthread_self(void);
+
 int pthread_equal(pthread_t, pthread_t);
+#define pthread_equal(x,y) ((x)==(y))
 
 int pthread_setcancelstate(int, int *);
 int pthread_setcanceltype(int, int *);
@@ -178,12 +183,17 @@ int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
 
 int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
 
+int pthread_getconcurrency(void);
+int pthread_setconcurrency(int);
+
 #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); \