summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorstefanf <stefanf@FreeBSD.org>2005-08-19 21:31:42 +0000
committerstefanf <stefanf@FreeBSD.org>2005-08-19 21:31:42 +0000
commitcb1c3eea784bed67621adba223b0549ec5730a77 (patch)
tree67c1a39113f2a15d17e7af116bbeebff1d3c81d4 /lib
parent8c74153b9cf6f359400dccd1c0bd72eaf534567d (diff)
downloadFreeBSD-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')
-rw-r--r--lib/libc_r/uthread/uthread_mattr_kind_np.c4
-rw-r--r--lib/libc_r/uthread/uthread_mutex.c2
-rw-r--r--lib/libkse/thread/thr_mattr_kind_np.c4
-rw-r--r--lib/libkse/thread/thr_mutex.c2
-rw-r--r--lib/libpthread/thread/thr_mattr_kind_np.c4
-rw-r--r--lib/libpthread/thread/thr_mutex.c2
-rw-r--r--lib/libthr/thread/thr_mutex.c2
-rw-r--r--lib/libthr/thread/thr_mutexattr.c4
8 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc_r/uthread/uthread_mattr_kind_np.c b/lib/libc_r/uthread/uthread_mattr_kind_np.c
index 59aa738..08fb0db 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 dc94d45..7c73868 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;
diff --git a/lib/libkse/thread/thr_mattr_kind_np.c b/lib/libkse/thread/thr_mattr_kind_np.c
index f3d30ff..2e9f333 100644
--- a/lib/libkse/thread/thr_mattr_kind_np.c
+++ b/lib/libkse/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/libkse/thread/thr_mutex.c b/lib/libkse/thread/thr_mutex.c
index b502c15..e095ac5 100644
--- a/lib/libkse/thread/thr_mutex.c
+++ b/lib/libkse/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;
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;
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index 2126080..e26f53b 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -120,7 +120,7 @@ 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;
diff --git a/lib/libthr/thread/thr_mutexattr.c b/lib/libthr/thread/thr_mutexattr.c
index 180afd3..042ff87 100644
--- a/lib/libthr/thread/thr_mutexattr.c
+++ b/lib/libthr/thread/thr_mutexattr.c
@@ -127,7 +127,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 {
@@ -143,7 +143,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;
OpenPOWER on IntegriCloud