pthread: PTHREAD_RECURSIVE_MUTEX_INITIALIZER is non-POSIX.
So add the _NP suffix like glibc does. Pointed out by sortie.
This commit is contained in:
@@ -78,7 +78,7 @@ extern "C" {
|
|||||||
|
|
||||||
#define PTHREAD_MUTEX_INITIALIZER \
|
#define PTHREAD_MUTEX_INITIALIZER \
|
||||||
{ PTHREAD_MUTEX_DEFAULT, 0, -42, -1, 0 }
|
{ PTHREAD_MUTEX_DEFAULT, 0, -42, -1, 0 }
|
||||||
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER \
|
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
|
||||||
{ PTHREAD_MUTEX_RECURSIVE, 0, -42, -1, 0 }
|
{ PTHREAD_MUTEX_RECURSIVE, 0, -42, -1, 0 }
|
||||||
#define PTHREAD_COND_INITIALIZER \
|
#define PTHREAD_COND_INITIALIZER \
|
||||||
{ 0, -42, NULL, 0, 0 }
|
{ 0, -42, NULL, 0, 0 }
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ BTokenSpace::BTokenSpace()
|
|||||||
:
|
:
|
||||||
fNextToken(1)
|
fNextToken(1)
|
||||||
{
|
{
|
||||||
fLock = (pthread_mutex_t)PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
|
fLock = (pthread_mutex_t)PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,6 @@
|
|||||||
#define __pthread_mutex_lock pthread_mutex_lock
|
#define __pthread_mutex_lock pthread_mutex_lock
|
||||||
#define __pthread_mutex_trylock pthread_mutex_trylock
|
#define __pthread_mutex_trylock pthread_mutex_trylock
|
||||||
#define __pthread_mutex_unlock pthread_mutex_unlock
|
#define __pthread_mutex_unlock pthread_mutex_unlock
|
||||||
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER
|
|
||||||
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
|
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
|
||||||
|
|
||||||
/* Mutex type. */
|
/* Mutex type. */
|
||||||
|
|||||||
Reference in New Issue
Block a user