diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
| commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
| tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /sysdeps/unix/sysv/linux/s390/bits/ipc.h | |
| parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
| parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/bits/ipc.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/ipc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/bits/ipc.h b/sysdeps/unix/sysv/linux/s390/bits/ipc.h index 39519a4a1c..1493af7967 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/ipc.h +++ b/sysdeps/unix/sysv/linux/s390/bits/ipc.h @@ -55,6 +55,6 @@ struct ipc_perm #endif unsigned short int __seq; /* Sequence number. */ unsigned short int __pad2; - unsigned long int __unused1; - unsigned long int __unused2; + unsigned long int __glibc_reserved1; + unsigned long int __glibc_reserved2; }; |