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