1999-09-06 Donn Terry <donn@interix.com>

	* internal.h (DTYPE): Define.
	* pe.h (struct external_PEI_filehdr): Rename from
	external_PE_filehdr.  Define even if COFF_IMAGE_WITH_PE is not
	defined.

diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index 659dcdc520a006a96764df4cc81d1450cd00a621..d946c772255e2cedbe4910cae40d56210b4eece3 100644 (file)
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,10 @@
+1999-09-06  Donn Terry  <donn@interix.com>
+
+       * internal.h (DTYPE): Define.
+       * pe.h (struct external_PEI_filehdr): Rename from
+       external_PE_filehdr.  Define even if COFF_IMAGE_WITH_PE is not
+       defined.
+
 1999-07-17  Nick Clifton  <nickc@cygnus.com>
 
        * arm.h (F_SOFT_FLOAT): Rename from F_SOFTFLOAT.

diff --git a/include/coff/internal.h b/include/coff/internal.h
index b01730eadcc854df675a5f27ed408ad8115f4cbe..e0f5067d960572c113e2877395d8e6e55d6762dd 100644 (file)
--- a/include/coff/internal.h
+++ b/include/coff/internal.h
@@ -421,6 +421,7 @@ struct internal_syment
 #define DT_ARY         (3)     /* array */
 
 #define BTYPE(x)       ((x) & N_BTMASK)
+#define DTYPE(x)       (((x) & N_TMASK) >> N_BTSHFT)
 
 #define ISPTR(x) \
   (((unsigned long) (x) & N_TMASK) == ((unsigned long) DT_PTR << N_BTSHFT))

diff --git a/include/coff/pe.h b/include/coff/pe.h
index 7e676a5088219189071b92c516284a6151fdf82d..7ea1f6cc3a099aa2efd7a15cc89dfe52c3ddb563 100644 (file)
--- a/include/coff/pe.h
+++ b/include/coff/pe.h
@@ -76,12 +76,7 @@
 #undef  FILNMLEN
 #define FILNMLEN       18      /* # characters in a file name          */
 
-
-#ifdef COFF_IMAGE_WITH_PE
-/* The filehdr is only weired in images */
-
-#undef FILHDR
-struct external_PE_filehdr
+struct external_PEI_filehdr
 {
   /* DOS header fields */
   char e_magic[2];             /* Magic number, 0x5a4d */
@@ -119,12 +114,16 @@ struct external_PE_filehdr
 
 };
 
+#ifdef COFF_IMAGE_WITH_PE
+
+/* The filehdr is only weird in images */
 
-#define FILHDR struct external_PE_filehdr
+#undef FILHDR
+#define FILHDR struct external_PEI_filehdr
 #undef FILHSZ
 #define FILHSZ 152
 
-#endif
+#endif /* COFF_IMAGE_WITH_PE */
 
 typedef struct 
 {