From f4cc5b017afebbb472d14224edfaec0a95b72bfa Mon Sep 17 00:00:00 2001
From: gwr <gwr@NetBSD.org>
Date: Fri, 9 Feb 1996 21:51:39 +0000
Subject: [PATCH] eliminate setjmp.h

---
 sys/arch/m68k/m68k/db_interface.c | 5 ++---
 sys/arch/m68k/m68k/db_trace.c     | 9 ++++-----
 sys/arch/sun3/sun3/fpu.c          | 6 ++----
 sys/arch/sun3/sun3/machdep.c      | 8 +++-----
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/sys/arch/m68k/m68k/db_interface.c b/sys/arch/m68k/m68k/db_interface.c
index f8249fc369cf..b96827556f88 100644
--- a/sys/arch/m68k/m68k/db_interface.c
+++ b/sys/arch/m68k/m68k/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.16 1995/06/09 20:03:05 leo Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.17 1996/02/09 21:51:39 gwr Exp $	*/
 
 /* 
  * Mach Operating System
@@ -33,7 +33,6 @@
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/systm.h> /* just for boothowto --eichin */
-#include <setjmp.h>
 
 #include <vm/vm.h>
 
@@ -41,7 +40,7 @@
 #include <machine/db_machdep.h>
 
 short	exframesize[];
-extern jmp_buf	*db_recover;
+extern label_t	*db_recover;
 
 int	db_active = 0;
 int ddb_regs_ssp;	/* system stack pointer */
diff --git a/sys/arch/m68k/m68k/db_trace.c b/sys/arch/m68k/m68k/db_trace.c
index 0750b4a40316..85f13b17adfb 100644
--- a/sys/arch/m68k/m68k/db_trace.c
+++ b/sys/arch/m68k/m68k/db_trace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_trace.c,v 1.12 1995/05/24 20:23:34 gwr Exp $	*/
+/*	$NetBSD: db_trace.c,v 1.13 1996/02/09 21:51:41 gwr Exp $	*/
 
 /* 
  * Mach Operating System
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
-#include <setjmp.h>
 
 #include <machine/db_machdep.h>
 
@@ -36,7 +35,7 @@
 #include <ddb/db_sym.h>
 #include <ddb/db_variables.h>
 
-jmp_buf	*db_recover;
+extern label_t	*db_recover;
 
 /*
  * Register list
@@ -263,8 +262,8 @@ findentry(sp)
 	register	instruc;
 	register	val;
 	db_addr_t	addr, calladdr, nextword;
-	jmp_buf		db_jmpbuf;
-	jmp_buf		*savejmp = db_recover;
+	label_t		db_jmpbuf;
+	label_t		*savejmp = db_recover;
 
 	if (setjmp(*(db_recover = &db_jmpbuf))) {
 		/* oops -- we touched something we ought not to have */
diff --git a/sys/arch/sun3/sun3/fpu.c b/sys/arch/sun3/sun3/fpu.c
index f19a1de509c2..544751a5b711 100644
--- a/sys/arch/sun3/sun3/fpu.c
+++ b/sys/arch/sun3/sun3/fpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.2 1995/06/27 14:40:14 gwr Exp $	*/
+/*	$NetBSD: fpu.c,v 1.3 1996/02/09 21:52:42 gwr Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -48,8 +48,6 @@
 #include <machine/mon.h>
 #include <machine/control.h>
 
-#include <setjmp.h>
-
 #include "interreg.h"
 
 extern int fpu_type;
@@ -119,7 +117,7 @@ void fpu_attach(parent, self, args)
 
 int fpu_probe()
 {
-	jmp_buf	faultbuf;
+	label_t	faultbuf;
 	int null_fpframe[2];
 
 	nofault = (long *) &faultbuf;
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index 073f777b2907..cb58ec655999 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.67 1996/01/04 22:22:54 jtc Exp $	*/
+/*	$NetBSD: machdep.c,v 1.68 1996/02/09 21:52:44 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -92,8 +92,6 @@
 
 #include <net/netisr.h>
 
-#include <setjmp.h>
-
 #include "cache.h"
 
 extern char *cpu_string;
@@ -936,7 +934,7 @@ int
 peek_word(addr)
 	register caddr_t addr;
 {
-	jmp_buf		faultbuf;
+	label_t		faultbuf;
 	register int x;
 
 	nofault = (long*)&faultbuf;
@@ -954,7 +952,7 @@ int
 peek_byte(addr)
 	register caddr_t addr;
 {
-	jmp_buf 	faultbuf;
+	label_t 	faultbuf;
 	register int x;
 
 	nofault = (long*)&faultbuf;