ce426f
commit 2307e1261e7ee784afd424a46ad08d3fbed33ba3
ce426f
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
ce426f
Date:   Tue Jun 24 22:40:07 2014 +0530
ce426f
ce426f
    Fix namespace violation in pthreadtypes.h (BZ #17084)
ce426f
    
ce426f
    This was causing conformtest failures on i386.
ce426f
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
ce426f
@@ -114,10 +114,10 @@ typedef union
ce426f
       {
ce426f
 	short __espins;
ce426f
 	short __elision;
ce426f
-# define __spins d.__espins
ce426f
-# define __elision d.__elision
ce426f
+# define __spins __elision_data.__espins
ce426f
+# define __elision __elision_data.__elision
ce426f
 # define __PTHREAD_MUTEX_HAVE_ELISION   2
ce426f
-      } d;
ce426f
+      } __elision_data;
ce426f
       __pthread_slist_t __list;
ce426f
     };
ce426f
 #endif