diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/fcntl.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index ef740a4849..c421559d3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-01-02 Joseph Myers <joseph@codesourcery.com> + [BZ #17780] + * sysdeps/unix/sysv/linux/mips/bits/fcntl.h (struct flock) + [!__USE_FILE_OFFSET64 && _MIPS_SIM != _ABI64]: Rename pad field to + __glibc_reserved0. + * nptl/version.c (banner): Use single year in copyright notice. * NEWS: Update copyright dates. diff --git a/NEWS b/NEWS index 68b6617d36..500cbc2137 100644 --- a/NEWS +++ b/NEWS @@ -16,7 +16,7 @@ Version 2.21 17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633, 17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747, - 17775 + 17775, 17780 * i386 memcpy functions optimized with SSE2 unaligned load/store. diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h index 61137c5907..80562831c0 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h @@ -84,7 +84,7 @@ struct flock #if ! defined __USE_FILE_OFFSET64 && _MIPS_SIM != _ABI64 /* The 64-bit flock structure, used by the n64 ABI, and for 64-bit flock in o32 and n32, never has this field. */ - long int pad[4]; + long int __glibc_reserved0[4]; #endif }; typedef struct flock flock_t; |