diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-26 11:10:43 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-27 07:30:58 -0700 |
| commit | 3ba5ac1fdf48c48f6c982669aaa9a2d3afadae6a (patch) | |
| tree | b2f6503edde04345cbd31a6b9f1cb7e978a7f01d | |
| parent | 3a9b3bda44435152f22d46bea48fcc415a0c7eb9 (diff) | |
| download | glibc-3ba5ac1fdf48c48f6c982669aaa9a2d3afadae6a.tar.gz | |
Properly define __ipc_pid_t
| -rw-r--r-- | ChangeLog.x32 | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog.x32 b/ChangeLog.x32 index 441a9c6f94..93d9144c50 100644 --- a/ChangeLog.x32 +++ b/ChangeLog.x32 @@ -1,5 +1,11 @@ 2012-05-26 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h: Don't + include <bits/types.h>. + (__ipc_pid_t): Properly define. + +2012-05-26 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/unix/sysv/linux/x86_64/x32/Makefile (sysdep_routines): Add arch_prctl. * sysdeps/unix/sysv/linux/x86_64/x32/arch_prctl.c: New file. diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h b/sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h index f8101b19fc..025bab54bf 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h @@ -24,9 +24,11 @@ #ifndef _BITS_IPCTYPES_H #define _BITS_IPCTYPES_H 1 -#include <bits/types.h> - /* Used in `struct shmid_ds'. */ -typedef __pid_t __ipc_pid_t; +# ifdef __x86_64__ +typedef int __ipc_pid_t; +# else +typedef unsigned short int __ipc_pid_t; +# endif #endif /* bits/ipctypes.h */ |