From b8dfdd92c7857fbb4a2418b9903b825b49d689c0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 31 May 2012 16:03:09 -0700 Subject: Use x86_64 bits/ipctypes.h for both i386 and x86-64 --- ChangeLog | 3 +++ sysdeps/unix/sysv/linux/x86/bits/ipctypes.h | 33 ++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h | 33 -------------------------- 3 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/x86/bits/ipctypes.h delete mode 100644 sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h diff --git a/ChangeLog b/ChangeLog index 8a16ab1..375b385 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2012-05-31 H.J. Lu [BZ #14117] + * sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h: Renamed to ... + * sysdeps/unix/sysv/linux/x86/bits/ipctypes.h: This. + * sysdeps/unix/sysv/linux/x86_64/bits/epoll.h: Renamed to ... * sysdeps/unix/sysv/linux/x86/bits/epoll.h: This. diff --git a/sysdeps/unix/sysv/linux/x86/bits/ipctypes.h b/sysdeps/unix/sysv/linux/x86/bits/ipctypes.h new file mode 100644 index 0000000..7c242ad --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/bits/ipctypes.h @@ -0,0 +1,33 @@ +/* bits/ipctypes.h -- Define some types used by SysV IPC/MSG/SHM. + Copyright (C) 2012 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_IPC_H +# error "Never use directly; include instead." +#endif + +#ifndef _BITS_IPCTYPES_H +#define _BITS_IPCTYPES_H 1 + +/* Used in `struct shmid_ds'. */ +# ifdef __x86_64__ +typedef int __ipc_pid_t; +# else +typedef unsigned short int __ipc_pid_t; +# endif + +#endif /* bits/ipctypes.h */ diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h b/sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h deleted file mode 100644 index 7c242ad..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h +++ /dev/null @@ -1,33 +0,0 @@ -/* bits/ipctypes.h -- Define some types used by SysV IPC/MSG/SHM. - Copyright (C) 2012 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _SYS_IPC_H -# error "Never use directly; include instead." -#endif - -#ifndef _BITS_IPCTYPES_H -#define _BITS_IPCTYPES_H 1 - -/* Used in `struct shmid_ds'. */ -# ifdef __x86_64__ -typedef int __ipc_pid_t; -# else -typedef unsigned short int __ipc_pid_t; -# endif - -#endif /* bits/ipctypes.h */ -- cgit v1.1