diff --git a/sys/i386/i386/exec_machdep.c b/sys/i386/i386/exec_machdep.c --- a/sys/i386/i386/exec_machdep.c +++ b/sys/i386/i386/exec_machdep.c @@ -256,7 +256,7 @@ static void freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { - struct sigframe4 sf, *sfp; + struct freebsd4_sigframe sf, *sfp; struct proc *p; struct thread *td; struct sigacts *psp; @@ -291,13 +291,13 @@ /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe4 *)((uintptr_t)td->td_sigstk.ss_sp + - td->td_sigstk.ss_size - sizeof(struct sigframe4)); + sfp = (struct freebsd4_sigframe *)((uintptr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct freebsd4_sigframe)); #if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else - sfp = (struct sigframe4 *)regs->tf_esp - 1; + sfp = (struct freebsd4_sigframe *)regs->tf_esp - 1; /* Build the argument list for the signal handler. */ sf.sf_signum = sig; diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -162,7 +162,7 @@ #endif ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc)); #ifdef COMPAT_FREEBSD4 -ASSYM(SIGF_UC4, offsetof(struct sigframe4, sf_uc)); +ASSYM(SIGF_UC4, offsetof(struct freebsd4_sigframe, sf_uc)); #endif #ifdef COMPAT_43 ASSYM(SC_PS, offsetof(struct osigcontext, sc_ps)); diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h --- a/sys/i386/include/sigframe.h +++ b/sys/i386/include/sigframe.h @@ -75,7 +75,7 @@ #endif #ifdef COMPAT_FREEBSD4 /* FreeBSD 4.x */ -struct sigframe4 { +struct freebsd4_sigframe { register_t sf_signum; register_t sf_siginfo; /* code or pointer to sf_si */ register_t sf_ucontext; /* points to sf_uc */