summaryrefslogtreecommitdiffstats
path: root/include/pthread.h
diff options
context:
space:
mode:
authorhsu <hsu@FreeBSD.org>1996-11-11 09:19:54 +0000
committerhsu <hsu@FreeBSD.org>1996-11-11 09:19:54 +0000
commit4b9077f2b95a885e88859c6fa959e48eb17df1f4 (patch)
tree727c965b61d7ba76b6ba9cf4f0c43a738ea86af1 /include/pthread.h
parent9c65a1a1867e5bf9e2dcdd8a6af3b1a004df06bd (diff)
downloadFreeBSD-src-4b9077f2b95a885e88859c6fa959e48eb17df1f4.zip
FreeBSD-src-4b9077f2b95a885e88859c6fa959e48eb17df1f4.tar.gz
Moved pthread_mutexattr_default inside #ifndef PTHREAD_KERNEL now that
we use it in the uthreads implementation. Moved enum pthread_mutextype here from libc_r/uthread/pthread_private.h. Change prototype for pthread_getspecific().
Diffstat (limited to 'include/pthread.h')
-rw-r--r--include/pthread.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/pthread.h b/include/pthread.h
index cbaeb3e..0b01d8e 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -128,11 +128,17 @@ struct pthread_once {
* Default attribute arguments.
*/
#define pthread_condattr_default NULL
-#define pthread_mutexattr_default NULL
#ifndef PTHREAD_KERNEL
+#define pthread_mutexattr_default NULL
#define pthread_attr_default NULL
#endif
+enum pthread_mutextype {
+ MUTEX_TYPE_FAST = 1,
+ MUTEX_TYPE_COUNTING_FAST = 2, /* Recursive */
+ MUTEX_TYPE_MAX
+};
+
/*
* Thread function prototype definitions:
*/
@@ -177,7 +183,7 @@ int pthread_create __P((pthread_t *, const pthread_attr_t *,
int pthread_detach __P((pthread_t *));
int pthread_equal __P((pthread_t, pthread_t));
void pthread_exit __P((void *));
-int pthread_getspecific __P((pthread_key_t, void **));
+void *pthread_getspecific __P((pthread_key_t));
int pthread_join __P((pthread_t, void **));
int pthread_key_create __P((pthread_key_t *,
void (*routine) (void *)));
OpenPOWER on IntegriCloud