From 231a59ce2c5719d2d77752c21092960e28837b4a Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Mon, 22 May 2017 22:28:09 -0400 Subject: 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. --- sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h') 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 -- cgit v1.2.3