From ad7c49168f8b32fedbe11f4675cb7d4bd3b896e6 Mon Sep 17 00:00:00 2001 From: Stefan Farfeleder Date: Fri, 19 Aug 2005 21:31:42 +0000 Subject: - 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 --- lib/libc_r/uthread/uthread_mattr_kind_np.c | 4 ++-- lib/libc_r/uthread/uthread_mutex.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/libc_r') diff --git a/lib/libc_r/uthread/uthread_mattr_kind_np.c b/lib/libc_r/uthread/uthread_mattr_kind_np.c index 59aa738ce9ce..08fb0dba0a4e 100644 --- a/lib/libc_r/uthread/uthread_mattr_kind_np.c +++ b/lib/libc_r/uthread/uthread_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/libc_r/uthread/uthread_mutex.c b/lib/libc_r/uthread/uthread_mutex.c index dc94d45eda17..7c738689ecd8 100644 --- a/lib/libc_r/uthread/uthread_mutex.c +++ b/lib/libc_r/uthread/uthread_mutex.c @@ -144,7 +144,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; -- cgit v1.3