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.

diff --git a/ChangeLog b/ChangeLog
index 70a4657c556230feff954efc3a636c694fe3cae2..d08a60a82401cd344cb2ccf21fdecc904180c6a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * sysdeps/i386/nptl/tls.h: Swap comments between THREAD_SETMEM and

diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
index 70ff250a17045fa4bfee55faa1f660148d412894..89d08823f54305b78ab71a05b9e9fdc910766422 100644 (file)
--- 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