X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fpthread.h;h=a0af20fe38e769ad787c6ec4310b6ad49d7bb44e;hp=12442085abe8725c4673b7a70d6ff324d1adf61f;hb=febbd12d00883a716a9edca25011f8aa306b859b;hpb=7d57e05fa8d15dc838638f7db19e88b02a21c18b

diff --git a/include/pthread.h b/include/pthread.h
index 12442085..a0af20fe 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -5,6 +5,7 @@ extern "C" {
 #endif
 
 #define __NEED_time_t
+#define __NEED_clockid_t
 #define __NEED_struct_timespec
 #define __NEED_sigset_t
 #define __NEED_pthread_t
@@ -64,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)
@@ -75,6 +76,9 @@ 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);
 
@@ -91,6 +95,7 @@ int pthread_mutex_unlock(pthread_mutex_t *);
 int pthread_mutex_trylock(pthread_mutex_t *);
 int pthread_mutex_timedlock(pthread_mutex_t *, const struct timespec *);
 int pthread_mutex_destroy(pthread_mutex_t *);
+int pthread_mutex_consistent(pthread_mutex_t *);
 
 int pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
 int pthread_cond_destroy(pthread_cond_t *);
@@ -127,21 +132,21 @@ int pthread_setspecific(pthread_key_t, const void *);
 int pthread_attr_init(pthread_attr_t *);
 int pthread_attr_destroy(pthread_attr_t *);
 
-int pthread_attr_getguardsize(pthread_attr_t *, size_t *);
+int pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
 int pthread_attr_setguardsize(pthread_attr_t *, size_t);
-int pthread_attr_getstacksize(pthread_attr_t *, size_t *);
+int pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
 int pthread_attr_setstacksize(pthread_attr_t *, size_t);
-int pthread_attr_getdetachstate(pthread_attr_t *, int *);
+int pthread_attr_getdetachstate(const pthread_attr_t *, int *);
 int pthread_attr_setdetachstate(pthread_attr_t *, int);
-int pthread_attr_getstack(pthread_attr_t *, void **, size_t *);
+int pthread_attr_getstack(const pthread_attr_t *, void **, size_t *);
 int pthread_attr_setstack(pthread_attr_t *, void *, size_t);
-int pthread_attr_getscope(pthread_attr_t *, int *);
+int pthread_attr_getscope(const pthread_attr_t *, int *);
 int pthread_attr_setscope(pthread_attr_t *, int);
-int pthread_attr_getschedpolicy(pthread_attr_t *, int *);
+int pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
 int pthread_attr_setschedpolicy(pthread_attr_t *, int);
-int pthread_attr_getschedparam(pthread_attr_t *, struct sched_param *);
+int pthread_attr_getschedparam(const pthread_attr_t *, struct sched_param *);
 int pthread_attr_setschedparam(pthread_attr_t *, const struct sched_param *);
-int pthread_attr_getinheritsched(pthread_attr_t *, int *);
+int pthread_attr_getinheritsched(const pthread_attr_t *, int *);
 int pthread_attr_setinheritsched(pthread_attr_t *, int);
 
 int pthread_mutexattr_destroy(pthread_mutexattr_t *);
@@ -176,12 +181,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); \