diff options
author | Jeffrey Hsu <hsu@FreeBSD.org> | 1996-11-11 09:19:54 +0000 |
---|---|---|
committer | Jeffrey Hsu <hsu@FreeBSD.org> | 1996-11-11 09:19:54 +0000 |
commit | 9362f73db882516717b9d687d11655db83ba6b2e (patch) | |
tree | 727c965b61d7ba76b6ba9cf4f0c43a738ea86af1 /include | |
parent | c1f20410c2d62b8f342a65c217059025dc38096b (diff) | |
download | src-9362f73db882516717b9d687d11655db83ba6b2e.tar.gz src-9362f73db882516717b9d687d11655db83ba6b2e.zip |
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().
Notes
Notes:
svn path=/head/; revision=19637
Diffstat (limited to 'include')
-rw-r--r-- | include/pthread.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/pthread.h b/include/pthread.h index cbaeb3eaf4dd..0b01d8e9d485 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 *))); |