From 2675499b51db7c174b1cd5db19769cd96c3d6b33 Mon Sep 17 00:00:00 2001
From: Stu Grossman <grossman@cygnus>
Date: Tue, 20 Oct 1992 07:03:38 +0000
Subject: [PATCH] 	* mips-nat.c:  Straighten out include files.  Work
 around 	conflicting defs of JB_xxx syms in <setjmp.h> and
 <machine/pcb.h> 	for Ultrix-4.2.

---
 gdb/ChangeLog  |  6 ++++++
 gdb/mips-nat.c | 23 ++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8403b1b81fb..a6a983bdd25 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 20 00:01:46 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* mips-nat.c:  Straighten out include files.  Work around
+	conflicting defs of JB_xxx syms in <setjmp.h> and <machine/pcb.h>
+	for Ultrix-4.2.
+
 Mon Oct 19 15:09:57 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* mips-nat.c (fetch_core_registers, register_addr):  Copy from
diff --git a/gdb/mips-nat.c b/gdb/mips-nat.c
index 7beb5826111..a4c46694995 100644
--- a/gdb/mips-nat.c
+++ b/gdb/mips-nat.c
@@ -23,18 +23,23 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "inferior.h"
 #include "gdbcore.h"
 #include <sys/ptrace.h>
-#include <setjmp.h>		/* For JB_XXX.  */
-
 #include <sys/types.h>
 #include <sys/param.h>
-#include "gdbcore.h"
-
-/* These are needed on various systems to expand REGISTER_U_ADDR.  */
-#include <sys/dir.h>
-#include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/user.h>
-#include <sys/ptrace.h>
+#undef JB_S0
+#undef JB_S1
+#undef JB_S2
+#undef JB_S3
+#undef JB_S4
+#undef JB_S5
+#undef JB_S6
+#undef JB_S7
+#undef JB_SP
+#undef JB_S8
+#undef JB_PC
+#undef JB_SR
+#undef NJBREGS
+#include <setjmp.h>		/* For JB_XXX.  */
 
 /* Size of elements in jmpbuf */
 
-- 
2.30.2