Revert "Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning"

This reverts commit 788bba368c2eaf8aa3fd2ca18d269395d6bc8afb.

diff --git a/ChangeLog b/ChangeLog
index 77c55d5cdee6f34daa4fc11d59ef97e4b6e6613c..d6d30e975495b3045fa6e74310904d3c28472665 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-03-17  Will Newton  <will.newton@linaro.org>
 
+       * nptl/sysdeps/pthread/pthread.h: Revert previous
+       change.
+
        * sysdeps/generic/ldsodefs.h: Revert previous
        change.
 

diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 142da639e48fa3eae1c6ae54a7e002c36a166d06..1e0c5dc937fccf05a46b4807e5fc939f7a061e7c 100644 (file)
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -83,16 +83,12 @@ enum
 
 
 /* Mutex initializers.  */
-#ifdef __PTHREAD_MUTEX_HAVE_ELISION
-# if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout.  */
-#  define __PTHREAD_SPINS 0, 0
-# elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout.  */
-#  define __PTHREAD_SPINS { 0, 0 }
-# else
-#  error "Unknown value of __PTHREAD_MUTEX_HAVE_ELISION"
-# endif
+#if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout.  */
+#define __PTHREAD_SPINS 0, 0
+#elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout.  */
+#define __PTHREAD_SPINS { 0, 0 }
 #else
-# define __PTHREAD_SPINS 0
+#define __PTHREAD_SPINS 0
 #endif
 
 #ifdef __PTHREAD_MUTEX_HAVE_PREV