From: Fred Fish <fnf@specifix.com>
Date: Wed, 17 Jun 1992 05:23:00 +0000 (+0000)
Subject: 	* mipsread.c:  Undo ill effects from including <strings.h>,
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fa0bcaa3a526dfdc149c6e04b3b97775f1170c08;p=deliverable%2Fbinutils-gdb.git

	* mipsread.c:  Undo ill effects from including <strings.h>,
	which #defines index to be strchr.  Unfortunately, index is
	a member of a symbol table structure that can't be changed.
	* mipsread.c:  tm-mips.h includes coff/symconst.h and coff/sym.h,
	remove redundant #include's.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e4434a43f1..27441390ae 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jun 16 22:17:49 1992  Fred Fish  (fnf@cygnus.com)
+
+	* mipsread.c:  Undo ill effects from including <strings.h>,
+	which #defines index to be strchr.  Unfortunately, index is
+	a member of a symbol table structure that can't be changed.
+	* mipsread.c:  tm-mips.h includes coff/symconst.h and coff/sym.h,
+	remove redundant #include's.
+
 Tue Jun 16 14:15:51 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* mipsread.c:  #include <strings.h> for rindex().
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index bd4bd68feb..89fe0500e2 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -69,9 +69,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/stat.h>
 #include <strings.h>
 
+/* Undo brain-damage in some <strings.h> that '#define index strchr'.
+   Note that tm-mips.h includes coff/sym.h, which has a structure with a
+   member named 'index'. */
+#undef index
+
 #include "coff/mips.h"		/* COFF-like aspects of ecoff files */
-#include "coff/sym.h"		/* Symbol structures in ecoff files */
-#include "coff/symconst.h"	/* Manifest constants in ecoff sym structures */
 #include "coff/ecoff-ext.h"	/* External forms of ecoff sym structures */
 
 #include "libaout.h"		/* FIXME Secret internal BFD stuff for a.out */