diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
commit | f71e9a28759c1f5d6e8dc0baced440e72507b433 (patch) | |
tree | d1ef7f1f84de67d0446b60c04f10a47c84ac1ddc /libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h | |
parent | 036dfd44bcc8ed8e97dcd9c763f61d3b59796941 (diff) | |
download | eglibc2-f71e9a28759c1f5d6e8dc0baced440e72507b433.tar.gz |
Merge changes between r24468 and r24941 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@24942 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h')
-rw-r--r-- | libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h b/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h index 5c118037b..21461d453 100644 --- a/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h +++ b/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2013 Free Software Foundation, Inc. +/* Copyright (C) 1995-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -53,8 +53,8 @@ struct shmid_ds __pid_t shm_cpid; /* pid of creator */ __pid_t shm_lpid; /* pid of last shmop */ shmatt_t shm_nattch; /* number of current attaches */ - unsigned long int __unused1; - unsigned long int __unused2; + unsigned long int __glibc_reserved1; + unsigned long int __glibc_reserved2; }; #ifdef __USE_MISC @@ -75,10 +75,10 @@ struct shminfo unsigned long int shmmni; unsigned long int shmseg; unsigned long int shmall; - unsigned long int __unused1; - unsigned long int __unused2; - unsigned long int __unused3; - unsigned long int __unused4; + unsigned long int __glibc_reserved1; + unsigned long int __glibc_reserved2; + unsigned long int __glibc_reserved3; + unsigned long int __glibc_reserved4; }; struct shm_info |