NPTL: Remove duplicate definition of PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
The PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP macro was defined twice with the same values in pthread.h; this removes the second definition.
This commit is contained in:
parent
4d611e1261
commit
675ddb7184
|
@ -1,3 +1,8 @@
|
||||||
|
2015-03-28 Martin Galvan <martin.galvan@tallertechnologies.com>
|
||||||
|
|
||||||
|
* sysdeps/nptl/pthread.h: Remove duplicate definition of
|
||||||
|
PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP.
|
||||||
|
|
||||||
2015-03-27 Martin Galvan <martin.galvan@tallertechnologies.com>
|
2015-03-27 Martin Galvan <martin.galvan@tallertechnologies.com>
|
||||||
|
|
||||||
* sysdeps/i386/nptl/tls.h: Swap comments between THREAD_SETMEM and
|
* sysdeps/i386/nptl/tls.h: Swap comments between THREAD_SETMEM and
|
||||||
|
|
|
@ -92,8 +92,6 @@ enum
|
||||||
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __PTHREAD_SPINS, { 0, 0 } } }
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __PTHREAD_SPINS, { 0, 0 } } }
|
||||||
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
|
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
|
||||||
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __PTHREAD_SPINS, { 0, 0 } } }
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __PTHREAD_SPINS, { 0, 0 } } }
|
||||||
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
|
|
||||||
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __PTHREAD_SPINS, { 0, 0 } } }
|
|
||||||
|
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue