From a2bc99d6f17e9888d7977c0e9943323e35b3e78a Mon Sep 17 00:00:00 2001 From: briggs Date: Sun, 23 Apr 1995 00:37:23 +0000 Subject: [PATCH] Make these compile again. --- sys/arch/mac68k/mac68k/machdep.c | 10 +--------- sys/arch/mac68k/mac68k/trap.c | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index 21f423c917a2..768643465d94 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.42 1995/04/22 20:27:33 christos Exp $ */ +/* $NetBSD: machdep.c,v 1.43 1995/04/23 00:37:23 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -517,14 +517,6 @@ sendsig(catcher, sig, mask, code) ft = frame->f_format; oonstack = psp->ps_sigstk.ss_flags & SA_ONSTACK; - - /* - * build the short SunOS frame instead - */ - sunos_sendsig(catcher, sig, mask, code); - return; - } -#endif /* * Allocate and validate space for the signal handler * context. Note that if the stack is in P0 space, the diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c index 53ad9ccbbedd..d7e3dc77ad17 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.27 1995/04/22 20:50:20 christos Exp $ */ +/* $NetBSD: trap.c,v 1.28 1995/04/23 00:37:29 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -66,6 +66,7 @@ #include #ifdef COMPAT_SUNOS +#include extern struct emul emul_sunos; #endif @@ -687,7 +688,7 @@ syscall(code, frame) * on the stack to skip, the argument follows the syscall * number without a gap. */ - if (code != SUNOS_SYS_sigreturn) { + if (code != SUNOS_SYS_sunos_sigreturn) { frame.f_regs[SP] += sizeof (int); /* * remember that we adjusted the SP,