- 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

9 files changed, 13 insertions, 17 deletions

diff --git a/include/pthread.h b/include/pthread.h
index 703fef6..f4abba1 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -121,8 +121,6 @@
  *
  *	PTHREAD_MUTEX_NORMAL
  *	PTHREAD_MUTEX_RECURSIVE
- *      MUTEX_TYPE_FAST (deprecated)
- *	MUTEX_TYPE_COUNTING_FAST (deprecated)
  *
  * will deviate from POSIX specified semantics.
  */
@@ -130,12 +128,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:
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;