diff options
| author |   brad <brad@openbsd.org> | 2005-10-31 20:48:30 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2005-10-31 20:48:30 +0000 |
| commit | 51cf9da7f8f12250562f08cc7a9346e4d61a47a4 (patch) | |
| tree | eaf5aff58f8efe601eac2328d04e868ea9a9694b /lib/libpthread/include/pthread.h | |
| parent | Fix reading large files; from NetBSD. Somehow this was overlooked (diff) | |
| download | wireguard-openbsd-51cf9da7f8f12250562f08cc7a9346e4d61a47a4.tar.xz wireguard-openbsd-51cf9da7f8f12250562f08cc7a9346e4d61a47a4.zip | |
- Prefix MUTEX_TYPE_MAX with PTHREAD_ to avoid namespace pollution.
- Remove the macros MUTEX_TYPE_FAST and MUTEX_TYPE_COUNTING_FAST.
From stefanf FreeBSD
ok fgsch@
Diffstat (limited to 'lib/libpthread/include/pthread.h')
| -rw-r--r-- | lib/libpthread/include/pthread.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h index 5dfa3824924..6320c6dea86 100644 --- a/lib/libpthread/include/pthread.h +++ b/lib/libpthread/include/pthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread.h,v 1.24 2005/10/30 04:00:38 brad Exp $ */ +/* $OpenBSD: pthread.h,v 1.25 2005/10/31 20:48:30 brad Exp $ */ /* * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu @@ -182,8 +182,6 @@ struct pthread_once { * * PTHREAD_MUTEX_NORMAL * PTHREAD_MUTEX_RECURSIVE - * MUTEX_TYPE_FAST (deprecated) - * MUTEX_TYPE_COUNTING_FAST (deprecated) * * will deviate from POSIX specified semantics. */ @@ -191,12 +189,10 @@ enum pthread_mutextype { PTHREAD_MUTEX_ERRORCHECK = 1, /* Default POSIX mutex */ PTHREAD_MUTEX_RECURSIVE = 2, /* Recursive mutex */ PTHREAD_MUTEX_NORMAL = 3, /* No error checking */ - MUTEX_TYPE_MAX + PTHREAD_MUTEX_TYPE_MAX }; #define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_ERRORCHECK -#define MUTEX_TYPE_FAST PTHREAD_MUTEX_NORMAL -#define MUTEX_TYPE_COUNTING_FAST PTHREAD_MUTEX_RECURSIVE /* * Thread function prototype definitions: |