X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fpthread.h;h=3d2e0c45d84abc83a98b128259f97fcd6c0d05f8;hb=ee9b5900fb098edd3e8d3df375cac8b2cfe8551f;hp=f7c9568c80bb3ef1f854137d548427d90d20b380;hpb=7406fdf5a18b37330de108abb0106f44ebdae2c6;p=musl

diff --git a/include/pthread.h b/include/pthread.h
index f7c9568c..3d2e0c45 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -63,6 +63,7 @@ extern "C" {
 
 #define PTHREAD_CANCEL_ENABLE 0
 #define PTHREAD_CANCEL_DISABLE 1
+#define PTHREAD_CANCEL_MASKED 2
 
 #define PTHREAD_CANCEL_DEFERRED 0
 #define PTHREAD_CANCEL_ASYNCHRONOUS 1
@@ -78,13 +79,12 @@ int pthread_detach(pthread_t);
 _Noreturn 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);
+#ifndef __cplusplus
 #define pthread_equal(x,y) ((x)==(y))
+#endif
 
 int pthread_setcancelstate(int, int *);
 int pthread_setcanceltype(int, int *);
@@ -214,6 +214,8 @@ struct cpu_set_t;
 int pthread_getaffinity_np(pthread_t, size_t, struct cpu_set_t *);
 int pthread_setaffinity_np(pthread_t, size_t, const struct cpu_set_t *);
 int pthread_getattr_np(pthread_t, pthread_attr_t *);
+int pthread_tryjoin_np(pthread_t, void **);
+int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);
 #endif
 
 #ifdef __cplusplus