about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-24 22:40:07 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-24 22:43:34 +0530
commit2307e1261e7ee784afd424a46ad08d3fbed33ba3 (patch)
treee31d4d71d74f24aba6f902aae903bafde7b32c3e /sysdeps
parentc0a4ed7799372c606c5b9aa0d4d84e3867fd09a5 (diff)
downloadglibc-2307e1261e7ee784afd424a46ad08d3fbed33ba3.tar.gz
glibc-2307e1261e7ee784afd424a46ad08d3fbed33ba3.tar.xz
glibc-2307e1261e7ee784afd424a46ad08d3fbed33ba3.zip
Fix namespace violation in pthreadtypes.h (BZ #17084)
This was causing conformtest failures on i386.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/x86/nptl/bits/pthreadtypes.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/nptl/bits/pthreadtypes.h
index 7f8076b89a..aad2e14c8d 100644
--- a/sysdeps/x86/nptl/bits/pthreadtypes.h
+++ b/sysdeps/x86/nptl/bits/pthreadtypes.h
@@ -115,10 +115,10 @@ typedef union
       {
 	short __espins;
 	short __elision;
-# define __spins d.__espins
-# define __elision d.__elision
+# define __spins __elision_data.__espins
+# define __elision __elision_data.__elision
 # define __PTHREAD_SPINS         { 0, 0 }
-      } d;
+      } __elision_data;
       __pthread_slist_t __list;
     };
 #endif