From 675ddb7184f642263331b13ac7bf726536504f97 Mon Sep 17 00:00:00 2001 From: Martin Galvan Date: Sat, 28 Mar 2015 01:41:35 -0300 Subject: 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. --- ChangeLog | 5 +++++ sysdeps/nptl/pthread.h | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70a4657c55..d08a60a824 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-28 Martin Galvan + + * sysdeps/nptl/pthread.h: Remove duplicate definition of + PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP. + 2015-03-27 Martin Galvan * sysdeps/i386/nptl/tls.h: Swap comments between THREAD_SETMEM and diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index 70ff250a17..89d08823f5 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -92,8 +92,6 @@ enum { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __PTHREAD_SPINS, { 0, 0 } } } # define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \ { { 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 #else -- cgit v1.2.3