diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-06-24 22:40:07 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-06-24 22:43:34 +0530 |
| commit | 2307e1261e7ee784afd424a46ad08d3fbed33ba3 (patch) | |
| tree | e31d4d71d74f24aba6f902aae903bafde7b32c3e | |
| parent | c0a4ed7799372c606c5b9aa0d4d84e3867fd09a5 (diff) | |
| download | glibc-2307e1261e7ee784afd424a46ad08d3fbed33ba3.tar glibc-2307e1261e7ee784afd424a46ad08d3fbed33ba3.tar.gz glibc-2307e1261e7ee784afd424a46ad08d3fbed33ba3.tar.bz2 glibc-2307e1261e7ee784afd424a46ad08d3fbed33ba3.zip | |
Fix namespace violation in pthreadtypes.h (BZ #17084)
This was causing conformtest failures on i386.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sysdeps/x86/nptl/bits/pthreadtypes.h | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2014-06-24 Siddhesh Poyarekar <siddhesh@redhat.com> + + [BZ #17084] + * sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_mutex_t): + Rename member __data.d to __data.__elision_data. + 2014-06-24 Wilco <wdijkstr@arm.com> * NEWS: Add 16918 to fixed bug list. @@ -21,7 +21,7 @@ Version 2.20 16912, 16915, 16916, 16917, 16918, 16922, 16927, 16928, 16932, 16943, 16958, 16965, 16966, 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17022, 17031, 17042, 17048, 17050, 17058, 17061, 17062, 17069, 17075, - 17079. + 17079, 17084. * Optimized strchr implementation for AArch64. Contributed by ARM Ltd. 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 |