>From f7eb8934396890e39b9e5e2b4fdd1534f1c024cc Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Mon, 16 Apr 2018 22:16:29 +0000 Subject: [PATCH 1/9] siginfo struct change following linux v4.16 this is supposed to be a cosmetic change only, not affecting api or abi, follows linux commit b68a68d3dcc15ebbf23cbe91af1abf57591bd96b and 859d880cf544dbe095ce97534ef04cd88ba2f2b4 with slightly different field names to follow musl conventions (which must be different to avoid depending on anonymous union support and polluting the namespace). --- include/signal.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/signal.h b/include/signal.h index a4f85cca..d68331e8 100644 --- a/include/signal.h +++ b/include/signal.h @@ -123,13 +123,17 @@ typedef struct { } __si_common; struct { void *si_addr; - short si_addr_lsb; union { + short si_addr_lsb; struct { + void *__dummy_bnd; void *si_lower; void *si_upper; } __addr_bnd; - unsigned si_pkey; + struct { + void *__dummy_pkey; + unsigned si_pkey; + } __addr_pkey; } __first; } __sigfault; struct { @@ -150,10 +154,10 @@ typedef struct { #define si_stime __si_fields.__si_common.__second.__sigchld.si_stime #define si_value __si_fields.__si_common.__second.si_value #define si_addr __si_fields.__sigfault.si_addr -#define si_addr_lsb __si_fields.__sigfault.si_addr_lsb +#define si_addr_lsb __si_fields.__sigfault.__first.si_addr_lsb #define si_lower __si_fields.__sigfault.__first.__addr_bnd.si_lower #define si_upper __si_fields.__sigfault.__first.__addr_bnd.si_upper -#define si_pkey __si_fields.__sigfault.__first.si_pkey +#define si_pkey __si_fields.__sigfault.__first.__addr_pkey.si_pkey #define si_band __si_fields.__sigpoll.si_band #define si_fd __si_fields.__sigpoll.si_fd #define si_timerid __si_fields.__si_common.__first.__timer.si_timerid -- 2.16.3