* libhppa.h: #undef e_* symbols which come from <machine/som.h>

	when compiling under HPUX.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ac925f9bb9240d7bc2a2ac6463d6ba5bac9be78c..f96af278ba910e2dade43cbb15532fc40e878989 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 30 20:04:10 1993  Stu Grossman  (grossman@cygnus.com)
+
+       * libhppa.h:  #undef e_* symbols which come from <machine/som.h>
+       when compiling under HPUX.
+
 Fri Apr 30 17:25:23 1993  Stu Grossman  (grossman@cygnus.com)
 
        * The following patches are from Jeffrey Law <law@cs.utah.edu>.

diff --git a/bfd/libhppa.h b/bfd/libhppa.h
index 76b096e9ce49a51247c534ecc5cd90f101f50d89..5ae54cbf4fec4cfd9b7c4ca24505e309bda528fc 100644 (file)
--- a/bfd/libhppa.h
+++ b/bfd/libhppa.h
@@ -139,6 +139,30 @@ enum hppa_reloc_field_selector_type
 
 };
 
+/* Need to undefine things defined in <machine/som.h> */
+
+#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
 {