summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-08-07 21:08:07 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-08-07 21:08:07 +0200
commit28d30d5db58b417f395fd0e7e47d49c874243c3f (patch)
tree30aeddb55f76091e60e38a595025a996129d103a
parentda70e8794f1c3e36a5bf3d2ba8089aec0caf8a0f (diff)
parent13453e9b8e169bf4048572a4ae1c8b3cb51ab215 (diff)
Merge commit 'refs/top-bases/t/hurdsig-fixes-2' into t/hurdsig-fixes-2
-rw-r--r--sysdeps/mach/hurd/bits/sigaction.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/bits/sigaction.h b/sysdeps/mach/hurd/bits/sigaction.h
index d7db36f611..444947c62b 100644
--- a/sysdeps/mach/hurd/bits/sigaction.h
+++ b/sysdeps/mach/hurd/bits/sigaction.h
@@ -33,7 +33,7 @@
struct sigaction
{
/* Signal handler. */
-#ifdef __USE_POSIX199309
+#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED
union
{
/* Used if SA_SIGINFO is not set. */
@@ -56,10 +56,10 @@ struct sigaction
};
/* Bits in `sa_flags'. */
-#if defined __USE_UNIX98 || defined __USE_MISC
+#if defined __USE_XOPEN_EXTENDED || defined __USE_MISC
# define SA_ONSTACK 0x0001 /* Take signal on signal stack. */
#endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
# define SA_RESTART 0x0002 /* Restart syscall on signal return. */
# define SA_NODEFER 0x0010 /* Don't automatically block the signal when
its handler is being executed. */