2001-08-22 Roland McGrath <roland@frob.com>

* sysdeps/generic/bits/sigaction.h (struct sigaction): Fix up
	conditionalization of sa_handler/sa_sigaction member types to
	match the sysdeps/unix/sysv/linux file.
This commit is contained in:
Roland McGrath 2001-08-23 03:07:50 +00:00
parent 40b145c443
commit bedbf86c74
2 changed files with 28 additions and 12 deletions

View File

@ -30,12 +30,20 @@
struct sigaction struct sigaction
{ {
/* Signal handler. */ /* Signal handler. */
union { #ifdef __USE_POSIX199309
__sighandler_t sa_handler; union
void (*sa_sigaction) (int, siginfo_t *, void *); {
} __sigaction_handler; /* Used if SA_SIGINFO is not set. */
# define sa_handler __sigaction_handler.sa_handler __sighandler_t sa_handler;
# define sa_sigaction __sigaction_handler.sa_sigaction /* Used if SA_SIGINFO is set. */
void (*sa_sigaction) (int, siginfo_t *, void *);
}
__sigaction_handler;
# define sa_handler __sigaction_handler.sa_handler
# define sa_sigaction __sigaction_handler.sa_sigaction
#else
__sighandler_t sa_handler;
#endif
/* Additional set of signals to be blocked. */ /* Additional set of signals to be blocked. */
__sigset_t sa_mask; __sigset_t sa_mask;

View File

@ -30,12 +30,20 @@
struct sigaction struct sigaction
{ {
/* Signal handler. */ /* Signal handler. */
union { #ifdef __USE_POSIX199309
__sighandler_t sa_handler; union
void (*sa_sigaction) (int, siginfo_t *, void *); {
} __sigaction_handler; /* Used if SA_SIGINFO is not set. */
# define sa_handler __sigaction_handler.sa_handler __sighandler_t sa_handler;
# define sa_sigaction __sigaction_handler.sa_sigaction /* Used if SA_SIGINFO is set. */
void (*sa_sigaction) (int, siginfo_t *, void *);
}
__sigaction_handler;
# define sa_handler __sigaction_handler.sa_handler
# define sa_sigaction __sigaction_handler.sa_sigaction
#else
__sighandler_t sa_handler;
#endif
/* Additional set of signals to be blocked. */ /* Additional set of signals to be blocked. */
__sigset_t sa_mask; __sigset_t sa_mask;