From 187066dcad5b65657b1a3a6e9ff18b390f24d062 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 7 Jul 2017 17:33:59 -0500 Subject: [PATCH] Cygwin: fix guard on struct siginfo_t Add line breaks to make it clearer that the struct packing applies to more than one struct. Signed-off-by: Yaakov Selkowitz --- winsup/cygwin/include/cygwin/signal.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/include/cygwin/signal.h b/winsup/cygwin/include/cygwin/signal.h index e73874c62..af0833688 100644 --- a/winsup/cygwin/include/cygwin/signal.h +++ b/winsup/cygwin/include/cygwin/signal.h @@ -175,7 +175,10 @@ typedef struct sigevent pthread_attr_t *sigev_notify_attributes; /* notification attributes */ } sigevent_t; +#if __POSIX_VISIBLE >= 199309 + #pragma pack(push,4) + struct _sigcommune { __uint32_t _si_code; @@ -190,8 +193,6 @@ struct _sigcommune }; }; -#if __POSIX_VISIBLE >= 199309 - #define __SI_PAD_SIZE 32 #ifdef __INSIDE_CYGWIN__ # ifndef max @@ -251,6 +252,7 @@ typedef struct #endif /*__INSIDE_CYGWIN__*/ }; } siginfo_t; + #pragma pack(pop) #endif /* __POSIX_VISIBLE >= 199309 */ -- 2.43.5