diff options
| author | stefanf <stefanf@FreeBSD.org> | 2005-08-19 21:31:42 +0000 |
|---|---|---|
| committer | stefanf <stefanf@FreeBSD.org> | 2005-08-19 21:31:42 +0000 |
| commit | cb1c3eea784bed67621adba223b0549ec5730a77 (patch) | |
| tree | 67c1a39113f2a15d17e7af116bbeebff1d3c81d4 /lib/libpthread | |
| parent | 8c74153b9cf6f359400dccd1c0bd72eaf534567d (diff) | |
| download | FreeBSD-src-cb1c3eea784bed67621adba223b0549ec5730a77.zip FreeBSD-src-cb1c3eea784bed67621adba223b0549ec5730a77.tar.gz | |
- Prefix MUTEX_TYPE_MAX with PTHREAD_ to avoid namespace pollution.
- Remove the macros MUTEX_TYPE_FAST and MUTEX_TYPE_COUNTING_FAST.
OK'ed by: deischen
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/thread/thr_mattr_kind_np.c | 4 | ||||
| -rw-r--r-- | lib/libpthread/thread/thr_mutex.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libpthread/thread/thr_mattr_kind_np.c b/lib/libpthread/thread/thr_mattr_kind_np.c index f3d30ff..2e9f333 100644 --- a/lib/libpthread/thread/thr_mattr_kind_np.c +++ b/lib/libpthread/thread/thr_mattr_kind_np.c @@ -71,7 +71,7 @@ int _pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) { int ret; - if (attr == NULL || *attr == NULL || type >= MUTEX_TYPE_MAX) { + if (attr == NULL || *attr == NULL || type >= PTHREAD_MUTEX_TYPE_MAX) { errno = EINVAL; ret = -1; } else { @@ -87,7 +87,7 @@ _pthread_mutexattr_gettype(pthread_mutexattr_t *attr, int *type) int ret; if (attr == NULL || *attr == NULL || (*attr)->m_type >= - MUTEX_TYPE_MAX) { + PTHREAD_MUTEX_TYPE_MAX) { ret = EINVAL; } else { *type = (*attr)->m_type; diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c index b502c15..e095ac5 100644 --- a/lib/libpthread/thread/thr_mutex.c +++ b/lib/libpthread/thread/thr_mutex.c @@ -128,7 +128,7 @@ __pthread_mutex_init(pthread_mutex_t *mutex, /* Check mutex type: */ else if (((*mutex_attr)->m_type < PTHREAD_MUTEX_ERRORCHECK) || - ((*mutex_attr)->m_type >= MUTEX_TYPE_MAX)) + ((*mutex_attr)->m_type >= PTHREAD_MUTEX_TYPE_MAX)) /* Return an invalid argument error: */ ret = EINVAL; |
