Prevent name clashes with sys/types.h on system V
This commit is contained in:
parent
80b250950e
commit
0c59e2e12d
|
@ -11,8 +11,8 @@
|
|||
#undef valu_t
|
||||
#define valu_t long
|
||||
|
||||
#undef addr_t
|
||||
#define addr_t long
|
||||
#undef ADDR_T
|
||||
#define ADDR_T long
|
||||
|
||||
#undef word_t
|
||||
#define word_t long
|
||||
|
|
|
@ -13,5 +13,5 @@
|
|||
|
||||
#undef valu_t
|
||||
#define valu_t long
|
||||
#undef addr_t
|
||||
#define addr_t long
|
||||
#undef ADDR_T
|
||||
#define ADDR_T long
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
|
||||
#undef valu_t
|
||||
#define valu_t long
|
||||
#undef addr_t
|
||||
#define addr_t long
|
||||
#undef ADDR_T
|
||||
#define ADDR_T long
|
||||
|
||||
#undef ASC_LPAR
|
||||
#define ASC_LPAR '{'
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
#undef valu_t
|
||||
#define valu_t long
|
||||
#undef addr_t
|
||||
#define addr_t long
|
||||
#undef ADDR_T
|
||||
#define ADDR_T long
|
||||
|
||||
#undef ALIGNWORD
|
||||
#define ALIGNWORD 2
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
#undef valu_t
|
||||
#define valu_t long
|
||||
#undef addr_t
|
||||
#define addr_t long
|
||||
#undef ADDR_T
|
||||
#define ADDR_T long
|
||||
#undef ALIGNSECT
|
||||
#define ALIGNSECT 2
|
||||
|
||||
|
|
|
@ -41,10 +41,8 @@
|
|||
|
||||
#define GENLAB "I" /* compiler generated labels */
|
||||
|
||||
#define ushort unsigned short
|
||||
|
||||
#define valu_t short /* type of expression values */
|
||||
#define addr_t ushort /* type of dot */
|
||||
#define ADDR_T unsigned short /* type of dot */
|
||||
#define word_t short /* type of keyword value */
|
||||
/*
|
||||
* NOTE: word_t is introduced to reduce the tokenfile size for machines
|
||||
|
@ -194,15 +192,15 @@ typedef struct item_t item_t;
|
|||
|
||||
struct sect_t {
|
||||
short s_flag; /* some flag bits */
|
||||
addr_t s_base; /* section base */
|
||||
addr_t s_size; /* section size */
|
||||
addr_t s_comm; /* length of commons */
|
||||
addr_t s_zero; /* delayed emit1(0) */
|
||||
addr_t s_lign; /* section alignment */
|
||||
ADDR_T s_base; /* section base */
|
||||
ADDR_T s_size; /* section size */
|
||||
ADDR_T s_comm; /* length of commons */
|
||||
ADDR_T s_zero; /* delayed emit1(0) */
|
||||
ADDR_T s_lign; /* section alignment */
|
||||
long s_foff; /* section file offset */
|
||||
item_t *s_item; /* points to section name */
|
||||
#ifdef THREE_PASS
|
||||
addr_t s_gain; /* gain in PASS_2 */
|
||||
ADDR_T s_gain; /* gain in PASS_2 */
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -67,10 +67,10 @@ extern sect_t sect[SECTMAX];
|
|||
* specials for the location counter
|
||||
*/
|
||||
extern sect_t *DOTSCT; /* §[DOTTYP-S_MIN] or NULL */
|
||||
extern addr_t DOTVAL; /* DOTSCT->s_size + DOTSCT->s_base */
|
||||
extern ADDR_T DOTVAL; /* DOTSCT->s_size + DOTSCT->s_base */
|
||||
extern short DOTTYP; /* S_MIN..S_MAX or S_UND */
|
||||
|
||||
extern ushort nname; /* Counts name table index in PASS_3 */
|
||||
extern unsigned short nname; /* Counts name table index in PASS_3 */
|
||||
|
||||
extern item_t *hashtab[H_TOTAL];
|
||||
extern short hashindex; /* see item_search() */
|
||||
|
|
|
@ -201,7 +201,7 @@ operation
|
|||
(short)(
|
||||
($4.typ & (S_EXT|S_TYP))
|
||||
|
|
||||
((ushort)$6<<8)
|
||||
((unsigned short)$6<<8)
|
||||
),
|
||||
(short)$7,
|
||||
$4.val
|
||||
|
@ -215,7 +215,7 @@ operation
|
|||
(short)(
|
||||
(DOTTYP & (S_EXT|S_TYP))
|
||||
|
|
||||
((ushort)$4<<8)
|
||||
((unsigned short)$4<<8)
|
||||
),
|
||||
(short)$6,
|
||||
(valu_t)DOTVAL
|
||||
|
|
|
@ -375,7 +375,7 @@ pass_23(n)
|
|||
{
|
||||
register i;
|
||||
#ifdef ASLD
|
||||
register addr_t base = 0;
|
||||
register ADDR_T base = 0;
|
||||
#endif
|
||||
register sect_t *sp;
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ register item_t *ip;
|
|||
{
|
||||
#if DEBUG != 0
|
||||
#ifdef THREE_PASS
|
||||
register addr_t oldval = ip->i_valu;
|
||||
register ADDR_T oldval = ip->i_valu;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
#define valu_t long
|
||||
#undef word_t
|
||||
#define word_t long
|
||||
#undef addr_t
|
||||
#define addr_t long
|
||||
#undef ADDR_T
|
||||
#define ADDR_T long
|
||||
|
||||
#undef ALIGNWORD
|
||||
#define ALIGNWORD 4
|
||||
|
|
|
@ -16,5 +16,5 @@
|
|||
#define ALIGNSECT 2
|
||||
#undef valu_t
|
||||
#define valu_t long
|
||||
#undef addr_t
|
||||
#define addr_t long
|
||||
#undef ADDR_T
|
||||
#define ADDR_T long
|
||||
|
|
Loading…
Reference in a new issue