merged changes from grep-1.6 (alpha)

[binutils.git] / include / coff-a29k.h

diff --git a/include/coff-a29k.h b/include/coff-a29k.h
index 35e4dddb10fc59ef22e7e5732c366f87e50e932e..8042d51fb3a6e1b05d0a4b5d3fc92a16168436ef 100755 (executable)
--- a/include/coff-a29k.h
+++ b/include/coff-a29k.h
@@ -36,12 +36,13 @@ struct external_filehdr
 #define SIPFBOMAGIC     0572    /* Am29000 (Byte 0 is MSB) */
 #define SIPRBOMAGIC     0573    /* Am29000 (Byte 0 is LSB) */
 
+
 #define A29K_MAGIC_BIG                 SIPFBOMAGIC     
 #define A29K_MAGIC_LITTLE      SIPRBOMAGIC     
 #define A29KBADMAG(x)  (((x).f_magic!=A29K_MAGIC_BIG) && \
                          ((x).f_magic!=A29K_MAGIC_LITTLE))
 
-
+#define OMAGIC A29K_MAGIC_BIG
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 
 /*
@@ -70,6 +71,7 @@ typedef       struct external_aouthdr
 } AOUTHDR;
 
 #define AOUTSZ (sizeof(AOUTHDR))
+#define AOUTHDRSZ (sizeof(AOUTHDR))
 
 /* aouthdr magic numbers */
 #define NMAGIC         0410    /* separate i/d executable */
@@ -203,12 +205,12 @@ struct external_lineno
 ** Symbol entry declaration and related definitions
 */
 
-#define        SYMNMLEN        8       /* Number of characters in a symbol name */
+#define        E_SYMNMLEN      8       /* Number of characters in a symbol name */
 
 struct external_syment
 {
   union {
-    char e_name[SYMNMLEN];
+    char e_name[E_SYMNMLEN];
     struct {
       char e_zeroes[4];
       char e_offset[4];
@@ -253,8 +255,8 @@ struct external_syment
 ** definitions.
 */
 
-#define FILNMLEN       14      /* # characters in a file name    */
-#define DIMNUM         4       /* # array dimensions in auxiliary entry */
+#define E_FILNMLEN     14      /* # characters in a file name    */
+#define E_DIMNUM       4       /* # array dimensions in auxiliary entry */
 
 union external_auxent {
        struct {
@@ -272,14 +274,14 @@ union external_auxent {
                            char x_endndx[4];   /* entry ndx past block end */
                        } x_fcn;
                        struct {                /* if ISARY, up to 4 dimen. */
-                           char x_dimen[DIMNUM][2];
+                           char x_dimen[E_DIMNUM][2];
                        } x_ary;
                } x_fcnary;
                char x_tvndx[2];                /* tv index */
        } x_sym;
 
        union {
-               char x_fname[FILNMLEN];
+               char x_fname[E_FILNMLEN];
                struct {
                        char x_zeroes[4];
                        char x_offset[4];