aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-05-22 22:28:09 -0400
committerZack Weinberg <zackw@panix.com>2017-05-22 22:32:09 -0400
commit231a59ce2c5719d2d77752c21092960e28837b4a (patch)
tree8027ab11263bad7d73188b34aebc3d881fc0dec2 /sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
parentf1a67a2c78601599be51a17250ca02c7d830d79d (diff)
downloadglibc-231a59ce2c5719d2d77752c21092960e28837b4a.tar
glibc-231a59ce2c5719d2d77752c21092960e28837b4a.tar.gz
glibc-231a59ce2c5719d2d77752c21092960e28837b4a.tar.bz2
glibc-231a59ce2c5719d2d77752c21092960e28837b4a.zip
Fix a bug in 'Remove __need macros from signal.h' (a992f506)
siginfo-arch.h is included in two different places, so the default definitions of the macros that it might or might not define need to be done conditionally afterward, not unconditionally beforehand. * sysdeps/unix/sysv/linux/bits/siginfo-consts.h (__SI_ASYNCIO_AFTER_SIGIO): Define default after including bits/siginfo-arch.h, only if not already defined. * sysdeps/unix/sysv/linux/bits/types/siginfo_t.h (__SI_ALIGNMENT, __SI_BAND_TYPE, __SI_CLOCK_T) (__SI_ERRNO_THEN_CODE, __SI_HAVE_SIGSYS, __SI_SEGFAULT_ADDL): Likewise. * sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h: Unconditionally define __SI_* macros.
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h')
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
index 6c85dbb6e8..7688a8d66d 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
@@ -10,9 +10,7 @@
attribute would be ignored if it were put in __SI_CLOCK_T instead
of encapsulated in a typedef. */
typedef __clock_t __attribute__ ((__aligned__ (4))) __sigchld_clock_t;
-# undef __SI_ALIGNMENT
# define __SI_ALIGNMENT __attribute__ ((__aligned__ (8)))
-# undef __SI_CLOCK_T
# define __SI_CLOCK_T __sigchld_clock_t
#endif