NPTL: Remove duplicate definition of PTHREAD_ADAPTIVE_MUTEX_INITIALIZ…

…ER_NP The PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP macro was defined twice with the same values in pthread.h; this removes the second definition.
git-mirror · Mar 28, 2015 · 675ddb7 · 675ddb7
1 parent 4d611e1
commit 675ddb7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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