* libhppa.h: Restore #undefs of e_fsel and other e_* symbols.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 05aa262fc92b0a5f702cf3617bed3802b39c0495..12beae35e7fa48d5c236346802e1514dd1f39dde 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 31 12:07:43 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * libhppa.h: Restore #undefs of e_fsel and other e_* symbols.
+
 Fri Aug 27 16:43:35 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
        * section.c (struct sec): Move position of user_set_vma, and

diff --git a/bfd/libhppa.h b/bfd/libhppa.h
index 14c8899040b162ae0ca3c1d0790165539363344f..f357fe5d47de568fda0aea85339ed9be9890cc3c 100644 (file)
--- a/bfd/libhppa.h
+++ b/bfd/libhppa.h
@@ -54,6 +54,33 @@ enum hppa_reloc_field_selector_type
     R_HPPA_RTSEL = 0xe
   };
 
+/* /usr/include/reloc.h defines these to constants.  We want to use
+   them in enums, so #undef them before we start using them.  We might
+   be able to fix this another way by simply managing not to include
+   /usr/include/reloc.h, but currently GDB picks up these defines
+   somewhere.  */
+#undef e_fsel
+#undef e_lssel
+#undef e_rssel
+#undef e_lsel
+#undef e_rsel
+#undef e_ldsel
+#undef e_rdsel
+#undef e_lrsel
+#undef e_rrsel
+#undef e_psel
+#undef e_lpsel
+#undef e_rpsel
+#undef e_tsel
+#undef e_ltsel
+#undef e_rtsel
+#undef e_one
+#undef e_two
+#undef e_pcrel
+#undef e_con
+#undef e_plabel
+#undef e_abs
+
 /* for compatibility */
 enum hppa_reloc_field_selector_type_alt
   {