diff options
| author | David Leonard <d@cvs.openbsd.org> | 2000-01-06 07:06:01 +0000 |
|---|---|---|
| committer | David Leonard <d@cvs.openbsd.org> | 2000-01-06 07:06:01 +0000 |
| commit | d8b1e43980ecb6fd274302cb87ce6482abe52c92 (patch) | |
| tree | f59b287b2b7273f51049094bb9dc6f1df0519701 /lib | |
| parent | 9cefcf1e1e59cdeb6e8701aefa83f650fb2c7452 (diff) | |
always define _POSIX_THREADS; volatile some types (mickey@)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc_r/include/pthread.h | 12 | ||||
| -rw-r--r-- | lib/libpthread/include/pthread.h | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/lib/libc_r/include/pthread.h b/lib/libc_r/include/pthread.h index 7940c9d5b63..bb49293c20b 100644 --- a/lib/libc_r/include/pthread.h +++ b/lib/libc_r/include/pthread.h @@ -30,18 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: pthread.h,v 1.10 2000/01/04 22:34:23 alex Exp $ + * $OpenBSD: pthread.h,v 1.11 2000/01/06 07:06:00 d Exp $ * * $FreeBSD: pthread.h,v 1.13 1999/07/31 08:36:07 rse Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ +/* Previous releases of OpenBSD used a hacked gcc that defined this */ #ifdef _POSIX_THREADS -#ifdef notyet -#warning -pthread option no longer needed - upgrade gcc -#endif -#undef _POSIX_THREADS +#undef _POSIX_THREADS /* Allow to be defined below */ #endif /* @@ -129,11 +127,11 @@ struct pthread_rwlockattr; */ typedef struct pthread *pthread_t; typedef struct pthread_attr *pthread_attr_t; -typedef struct pthread_mutex *pthread_mutex_t; +typedef volatile struct pthread_mutex *pthread_mutex_t; typedef struct pthread_mutex_attr *pthread_mutexattr_t; typedef struct pthread_cond *pthread_cond_t; typedef struct pthread_cond_attr *pthread_condattr_t; -typedef int pthread_key_t; +typedef volatile int pthread_key_t; typedef struct pthread_once pthread_once_t; typedef struct pthread_rwlock *pthread_rwlock_t; typedef struct pthread_rwlockattr *pthread_rwlockattr_t; diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h index 7940c9d5b63..bb49293c20b 100644 --- a/lib/libpthread/include/pthread.h +++ b/lib/libpthread/include/pthread.h @@ -30,18 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: pthread.h,v 1.10 2000/01/04 22:34:23 alex Exp $ + * $OpenBSD: pthread.h,v 1.11 2000/01/06 07:06:00 d Exp $ * * $FreeBSD: pthread.h,v 1.13 1999/07/31 08:36:07 rse Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ +/* Previous releases of OpenBSD used a hacked gcc that defined this */ #ifdef _POSIX_THREADS -#ifdef notyet -#warning -pthread option no longer needed - upgrade gcc -#endif -#undef _POSIX_THREADS +#undef _POSIX_THREADS /* Allow to be defined below */ #endif /* @@ -129,11 +127,11 @@ struct pthread_rwlockattr; */ typedef struct pthread *pthread_t; typedef struct pthread_attr *pthread_attr_t; -typedef struct pthread_mutex *pthread_mutex_t; +typedef volatile struct pthread_mutex *pthread_mutex_t; typedef struct pthread_mutex_attr *pthread_mutexattr_t; typedef struct pthread_cond *pthread_cond_t; typedef struct pthread_cond_attr *pthread_condattr_t; -typedef int pthread_key_t; +typedef volatile int pthread_key_t; typedef struct pthread_once pthread_once_t; typedef struct pthread_rwlock *pthread_rwlock_t; typedef struct pthread_rwlockattr *pthread_rwlockattr_t; |