about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/bits
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits')
-rw-r--r--sysdeps/unix/sysv/linux/bits/siginfo-consts.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/types/siginfo_t.h24
2 files changed, 21 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
index a7a31bfe5f..525840cea1 100644
--- a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
+++ b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
@@ -25,8 +25,10 @@
 
 /* Most of these constants are uniform across all architectures, but there
    is one exception.  */
-#define __SI_ASYNCIO_AFTER_SIGIO 1
 #include <bits/siginfo-arch.h>
+#ifndef __SI_ASYNCIO_AFTER_SIGIO
+# define __SI_ASYNCIO_AFTER_SIGIO 1
+#endif
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated
    signals.  */
diff --git a/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h b/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
index 1bb6da5264..bed69148f9 100644
--- a/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
+++ b/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
@@ -13,13 +13,25 @@
 #endif
 
 /* Some fields of siginfo_t have architecture-specific variations.  */
-#define __SI_ALIGNMENT		/* nothing */
-#define __SI_BAND_TYPE		long int
-#define __SI_CLOCK_T		__clock_t
-#define __SI_ERRNO_THEN_CODE	1
-#define __SI_HAVE_SIGSYS	1
-#define __SI_SIGFAULT_ADDL	/* nothing */
 #include <bits/siginfo-arch.h>
+#ifndef __SI_ALIGNMENT
+# define __SI_ALIGNMENT		/* nothing */
+#endif
+#ifndef __SI_BAND_TYPE
+# define __SI_BAND_TYPE		long int
+#endif
+#ifndef __SI_CLOCK_T
+# define __SI_CLOCK_T		__clock_t
+#endif
+#ifndef __SI_ERRNO_THEN_CODE
+# define __SI_ERRNO_THEN_CODE	1
+#endif
+#ifndef __SI_HAVE_SIGSYS
+# define __SI_HAVE_SIGSYS	1
+#endif
+#ifndef __SI_SIGFAULT_ADDL
+# define __SI_SIGFAULT_ADDL	/* nothing */
+#endif
 
 typedef struct
   {