* unexelf.c (PT_LOAD, SHT_*, SHN_*) [__NetBSD__]: Only provide

standard ELF definitions here if the system header does not.

2 files changed, 18 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e4bd79a715e..dbc54c009c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-03  Ken Raeburn  <raeburn@gnu.org>
+
+        * unexelf.c (PT_LOAD, SHT_*, SHN_*) [__NetBSD__]: Only provide
+        standard ELF definitions here if the system header does not.
+
 2000-03-03  Gerd Moellmann  <gerd@gnu.org>
 
         * xterm.c (PER_CHAR_METRIC): Removed.
diff --git a/src/unexelf.c b/src/unexelf.c
index ad0f346be3c..a90885ba64f 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -478,17 +478,19 @@ typedef struct {
 # endif
 # include <sys/exec_elf.h>
 
-# define PT_LOAD        Elf_pt_load
-# define SHT_SYMTAB     Elf_sht_symtab
-# define SHT_DYNSYM     Elf_sht_dynsym
-# define SHT_NULL       Elf_sht_null
-# define SHT_NOBITS     Elf_sht_nobits
-# define SHT_REL        Elf_sht_rel
-# define SHT_RELA       Elf_sht_rela
-
-# define SHN_UNDEF      Elf_eshn_undefined
-# define SHN_ABS        Elf_eshn_absolute
-# define SHN_COMMON     Elf_eshn_common
+# ifndef PT_LOAD
+#  define PT_LOAD       Elf_pt_load
+#  define SHT_SYMTAB    Elf_sht_symtab
+#  define SHT_DYNSYM    Elf_sht_dynsym
+#  define SHT_NULL      Elf_sht_null
+#  define SHT_NOBITS    Elf_sht_nobits
+#  define SHT_REL       Elf_sht_rel
+#  define SHT_RELA      Elf_sht_rela
+
+#  define SHN_UNDEF     Elf_eshn_undefined
+#  define SHN_ABS       Elf_eshn_absolute
+#  define SHN_COMMON    Elf_eshn_common
+# endif
 
 # ifdef __alpha__
 #  include <sys/exec_ecoff.h>