diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-07-27 09:10:40 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-07-27 09:10:40 +0000 |
| commit | 35faad6006d60bd7ea61c272c84c9597a902ed4e (patch) | |
| tree | a5587a4fbaaedafae5539d60c7304c8e36b2bd7c /sys | |
| parent | 97989fe48b0f4b1bbcbb12bc0e3a677001a2b266 (diff) | |
sa__handler to avoid sa_handler stuff coming before 2000....
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/compat/hpux/hpux.h | 4 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_sig.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/compat/hpux/hpux.h b/sys/compat/hpux/hpux.h index d467c4d1815..f586389290f 100644 --- a/sys/compat/hpux/hpux.h +++ b/sys/compat/hpux/hpux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux.h,v 1.4 1997/04/16 09:17:59 downsj Exp $ */ +/* $OpenBSD: hpux.h,v 1.5 1997/07/27 09:10:38 deraadt Exp $ */ /* $NetBSD: hpux.h,v 1.11 1997/04/01 19:58:58 scottr Exp $ */ /* @@ -282,7 +282,7 @@ struct hpux_shmid_ds { /* HP-UX POSIX signal stuff implementation */ typedef struct __hpux_sigset_t { long sigset[8]; } hpux_sigset_t; struct hpux_sigaction { - void (*sa_handler) __P((int)); + void (*sa__handler) __P((int)); hpux_sigset_t sa_mask; int sa_flags; }; diff --git a/sys/compat/hpux/hpux_sig.c b/sys/compat/hpux/hpux_sig.c index 8bb6589a4c6..182cdf0b994 100644 --- a/sys/compat/hpux/hpux_sig.c +++ b/sys/compat/hpux/hpux_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_sig.c,v 1.4 1997/04/16 09:18:09 downsj Exp $ */ +/* $OpenBSD: hpux_sig.c,v 1.5 1997/07/27 09:10:39 deraadt Exp $ */ /* $NetBSD: hpux_sig.c,v 1.16 1997/04/01 19:59:02 scottr Exp $ */ /* @@ -308,7 +308,7 @@ hpux_sys_sigaction(p, v, retval) sa = &action; if (SCARG(uap, osa)) { - sa->sa_handler = ps->ps_sigact[sig]; + sa->sa__handler = ps->ps_sigact[sig]; bzero((caddr_t)&sa->sa_mask, sizeof(sa->sa_mask)); sa->sa_mask.sigset[0] = bsdtohpuxmask(ps->ps_catchmask[sig]); bit = sigmask(sig); @@ -329,12 +329,12 @@ hpux_sys_sigaction(p, v, retval) if (copyin((caddr_t)SCARG(uap, nsa), (caddr_t)sa, sizeof (action))) return (EFAULT); - if (sig == SIGCONT && sa->sa_handler == SIG_IGN) + if (sig == SIGCONT && sa->sa__handler == SIG_IGN) return (EINVAL); /* * Create a sigaction struct for setsigvec */ - act.sa_handler = sa->sa_handler; + act.sa_handler = sa->sa__handler; act.sa_mask = hpuxtobsdmask(sa->sa_mask.sigset[0]); act.sa_flags = SA_RESTART; if (sa->sa_flags & HPUXSA_ONSTACK) |