From 04ec140a2e250a616794285e19d481cf3fa4e790 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Mon, 17 Mar 2014 20:40:33 +0000 Subject: Revert "Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning" This reverts commit 788bba368c2eaf8aa3fd2ca18d269395d6bc8afb. --- nptl/sysdeps/pthread/pthread.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'nptl') diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 142da639e4..1e0c5dc937 100644 --- 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 -- cgit 1.4.1