d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed macro defining ushort; gave clash with /usr/include/sys/types.h

Browse source
This commit is contained in:
ceriel 1991-12-12 14:15:14 +00:00
parent 8e82c748ad
commit b53facde73
1 changed files with 50 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
h/out.h
View file

@ -9,17 +9,14 @@
/* /*
* output format for ACK assemblers * output format for ACK assemblers
*/ */
#ifndef ushort
#define ushort unsigned short
#endif /* ushort */
struct outhead { struct outhead {
ushort oh_magic; /* magic number */ unsigned short oh_magic; /* magic number */
ushort oh_stamp; /* version stamp */ unsigned short oh_stamp; /* version stamp */
ushort oh_flags; /* several format flags */ unsigned short oh_flags; /* several format flags */
ushort oh_nsect; /* number of outsect structures */ unsigned short oh_nsect; /* number of outsect structures */
ushort oh_nrelo; /* number of outrelo structures */ unsigned short oh_nrelo; /* number of outrelo structures */
ushort oh_nname; /* number of outname structures */ unsigned short oh_nname; /* number of outname structures */
long oh_nemit; /* sum of all os_flen */ long oh_nemit; /* sum of all os_flen */
long oh_nchar; /* size of string area */ long oh_nchar; /* size of string area */
}; };
@ -42,7 +39,7 @@ struct outsect {
struct outrelo { struct outrelo {
char or_type; /* type of reference */ char or_type; /* type of reference */
char or_sect; /* referencing section */ char or_sect; /* referencing section */
ushort or_nami; /* referenced symbol index */ unsigned short or_nami; /* referenced symbol index */
long or_addr; /* referencing address */ long or_addr; /* referencing address */
}; };
@ -53,8 +50,8 @@ struct outname {
} on_u; } on_u;
#define on_mptr on_u.on_ptr #define on_mptr on_u.on_ptr
#define on_foff on_u.on_off #define on_foff on_u.on_off
ushort on_type; /* symbol type */ unsigned short on_type; /* symbol type */
ushort on_desc; /* debug info */ unsigned short on_desc; /* debug info */
long on_valu; /* symbol value */ long on_valu; /* symbol value */
}; };