(SHT_MIPS_DEBUG, HDRR) [__mips__]: Really confine last change to __NetBSD__.

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f5414f09e7b..5e9690bd845 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-08  Dave Love  <fx@gnu.org>
+
+        * unexelf.c (SHT_MIPS_DEBUG, HDRR) [__mips__]: Really confine last
+        change to __NetBSD__.
+
 2000-09-08  Kenichi Handa  <handa@etl.go.jp>
 
         * search.c (compile_pattern): Check the multibyteness of cached
diff --git a/src/unexelf.c b/src/unexelf.c
index 7e298239a71..1c534a6f2e2 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -406,6 +406,7 @@ Filesz      Memsz       Flags       Align
 
 #ifndef emacs
 #define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
+#include <string.h>
 #else
 #include <config.h>
 extern void fatal (char *, ...);
@@ -415,7 +416,6 @@ extern void fatal (char *, ...);
 #include <stdio.h>
 #include <sys/stat.h>
 #include <memory.h>
-#include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -499,12 +499,12 @@ typedef struct {
 #  define HDRR          struct ecoff_symhdr
 #  define pHDRR         HDRR *
 # endif /* __alpha__ */
-#endif /* __NetBSD__ */
 
-#ifdef __mips__                                 /* was in pkgsrc patches for 20.7 */
+#ifdef __mips__                 /* was in pkgsrc patches for 20.7 */
 # define SHT_MIPS_DEBUG DT_MIPS_FLAGS
 # define HDRR           struct Elf_Shdr
 #endif /* __mips__ */
+#endif /* __NetBSD__ */
 
 #ifdef __OpenBSD__
 # include <sys/exec_elf.h>