aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStu Grossman <grossman@cygnus>1992-10-20 07:03:38 +0000
committerStu Grossman <grossman@cygnus>1992-10-20 07:03:38 +0000
commit2675499b51db7c174b1cd5db19769cd96c3d6b33 (patch)
tree2af2d60d122f1d340c2de5656570eed52d1b118f
parent56fc16c70b1b54ce459dbd471b77f40385257356 (diff)
downloadgdb-2675499b51db7c174b1cd5db19769cd96c3d6b33.zip
gdb-2675499b51db7c174b1cd5db19769cd96c3d6b33.tar.gz
gdb-2675499b51db7c174b1cd5db19769cd96c3d6b33.tar.bz2
* 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.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/mips-nat.c23
2 files changed, 20 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8403b1b..a6a983b 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 7beb582..a4c4669 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 */