Revert "Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning"

This reverts commit 788bba368c.
This commit is contained in:
Will Newton 2014-03-17 20:40:33 +00:00
parent 7579d8d5cb
commit 04ec140a2e
2 changed files with 8 additions and 9 deletions

View File

@ -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.

View File

@ -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