* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8403b1b81fb1636f98f0eb7e76b84e7c913c10a7..a6a983bdd25ba9387aa59b5e9db509c84bb0b446 100644 (file)
--- 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 7beb58261119562125f6a5aa280c4f50a8dfa585..a4c46694995dae1e1105be0f4ba11e4de0f31b64 100644 (file)
--- 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 */