d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Prefix MUTEX_TYPE_MAX with PTHREAD_ to avoid namespace pollution.

Browse Source 
- Remove the macros MUTEX_TYPE_FAST and MUTEX_TYPE_COUNTING_FAST.

OK'ed by:	deischen
This commit is contained in:
Stefan Farfeleder 2005-08-19 21:31:42 +00:00
parent 7cd5160a0b
commit ad7c49168f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=149298
9 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pthread.h
View File

@ -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:

4
lib/libc_r/uthread/uthread_mattr_kind_np.c
View File

@ -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;

2
lib/libc_r/uthread/uthread_mutex.c
View File

@ -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;

4
lib/libkse/thread/thr_mattr_kind_np.c
View File

@ -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;

2
lib/libkse/thread/thr_mutex.c
View File

@ -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;

4
lib/libpthread/thread/thr_mattr_kind_np.c
View File

@ -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;

2
lib/libpthread/thread/thr_mutex.c
View File

@ -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;

2
lib/libthr/thread/thr_mutex.c
View File

@ -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;

4
lib/libthr/thread/thr_mutexattr.c
View File

@ -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;