From 08172a193d52fbe8e79c9eaf2345f4869c0d07bb Mon Sep 17 00:00:00 2001 From: skidder Date: Mon, 8 Mar 2004 18:44:24 +0000 Subject: [PATCH] Rollback my recent change since it made Sinix-Z unhappy --- src/jrd/common.h | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/jrd/common.h b/src/jrd/common.h index 39cb8c46aa..3d0618143c 100644 --- a/src/jrd/common.h +++ b/src/jrd/common.h @@ -49,7 +49,7 @@ * */ /* -$Id: common.h,v 1.105 2004-03-08 02:07:38 skidder Exp $ +$Id: common.h,v 1.106 2004-03-08 18:44:24 skidder Exp $ */ #ifndef JRD_COMMON_H @@ -185,6 +185,35 @@ int syslog(int pri, char *fmt, ...); #define dlopen(a,b) dlopen((char *)(a),(b)) #define dlsym(a,b) dlsym((a), (char *)(b)) +#include +#include + +struct sinixz_sigaction + { + int sa_flags; + union + { + /* Used if SA_SIGINFO is not set. */ + void (*sa_handler)(int); + /* 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 + sigset_t sa_mask; + int sa_resv[2]; + }; + +static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act, + struct sinixz_sigaction *oact) +{ + return sigaction(sig, (struct sigaction*)act, (struct sigaction*)oact); +} + +// Re-define things actually +#define sigaction sinixz_sigaction + #define QUADFORMAT "ll" #define QUADCONST(n) (n##LL)