Invoke aout N_* macros with pointer to struct internal_exec

[deliverable/binutils-gdb.git] / include / aout / adobe.h

diff --git a/include/aout/adobe.h b/include/aout/adobe.h
index 9c72fa51608550ab42fb63a286c73986f6810f72..cf8cfce1dccb0de7dd04b45862660a19452e5640 100644 (file)
--- a/include/aout/adobe.h
+++ b/include/aout/adobe.h
@@ -47,7 +47,7 @@ struct external_exec
 #undef OMAGIC
 #undef NMAGIC
 
-#define N_BADMAG(x)      ((x).a_info != ZMAGIC)
+#define N_BADMAG(x)      ((x)->a_info != ZMAGIC)
 
 /* By default, segment size is constant.  But some machines override this
    to be a function of the a.out header (e.g. machine type).  */
@@ -77,25 +77,25 @@ struct internal_segdesc {
        unsigned int    a_filebase;     /* Base address in object file */
 };
 
-#define N_TXTADDR(x) \
+#define N_TXTADDR(x) is_this_really_unused?
 
 /* This is documented to be at 1024, but appears to really be at 2048.
    FIXME?!  */
 #define N_TXTOFF(x)    2048
 
-#define        N_TXTSIZE(x) ((x).a_text)
+#define        N_TXTSIZE(x) ((x)->a_text)
 
-#define N_DATADDR(x)
+#define N_DATADDR(x) is_this_really_unused?
 
-#define N_BSSADDR(x)
+#define N_BSSADDR(x) is_this_really_unused?
 
 /* Offsets of the various portions of the file after the text segment.  */
 
 #define N_DATOFF(x)    ( N_TXTOFF(x) + N_TXTSIZE(x) )
-#define N_TRELOFF(x)   ( N_DATOFF(x) + (x).a_data )
-#define N_DRELOFF(x)   ( N_TRELOFF(x) + (x).a_trsize )
-#define N_SYMOFF(x)    ( N_DRELOFF(x) + (x).a_drsize )
-#define N_STROFF(x)    ( N_SYMOFF(x) + (x).a_syms )
+#define N_TRELOFF(x)   ( N_DATOFF(x) + (x)->a_data )
+#define N_DRELOFF(x)   ( N_TRELOFF(x) + (x)->a_trsize )
+#define N_SYMOFF(x)    ( N_DRELOFF(x) + (x)->a_drsize )
+#define N_STROFF(x)    ( N_SYMOFF(x) + (x)->a_syms )
 \f
 /* Symbols */
 struct external_nlist {