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

Prevent name clashes with sys/types.h on system V

Browse source
This commit is contained in:
ceriel 1991-12-16 15:24:24 +00:00
parent 80b250950e
commit 0c59e2e12d
12 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mach/arm/as/mach0.c
View file

@ -11,8 +11,8 @@
#undef valu_t #undef valu_t
#define valu_t long #define valu_t long
#undef addr_t #undef ADDR_T
#define addr_t long #define ADDR_T long
#undef word_t #undef word_t
#define word_t long #define word_t long

4
mach/i386/as/mach0.c
View file

@ -13,5 +13,5 @@
#undef valu_t #undef valu_t
#define valu_t long #define valu_t long
#undef addr_t #undef ADDR_T
#define addr_t long #define ADDR_T long

4
mach/m68020/as/mach0.c
View file

@ -16,8 +16,8 @@
#undef valu_t #undef valu_t
#define valu_t long #define valu_t long
#undef addr_t #undef ADDR_T
#define addr_t long #define ADDR_T long
#undef ASC_LPAR #undef ASC_LPAR
#define ASC_LPAR '{' #define ASC_LPAR '{'

4
mach/m68k2/as/mach0.c
View file

@ -19,8 +19,8 @@
#undef valu_t #undef valu_t
#define valu_t long #define valu_t long
#undef addr_t #undef ADDR_T
#define addr_t long #define ADDR_T long
#undef ALIGNWORD #undef ALIGNWORD
#define ALIGNWORD 2 #define ALIGNWORD 2

4
mach/ns/as/mach0.c
View file

@ -12,8 +12,8 @@
#undef valu_t #undef valu_t
#define valu_t long #define valu_t long
#undef addr_t #undef ADDR_T
#define addr_t long #define ADDR_T long
#undef ALIGNSECT #undef ALIGNSECT
#define ALIGNSECT 2 #define ALIGNSECT 2

16
mach/proto/as/comm0.h
View file

@ -41,10 +41,8 @@
#define GENLAB "I" /* compiler generated labels */ #define GENLAB "I" /* compiler generated labels */
#define ushort unsigned short
#define valu_t short /* type of expression values */ #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 */ #define word_t short /* type of keyword value */
/* /*
* NOTE: word_t is introduced to reduce the tokenfile size for machines * 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 { struct sect_t {
short s_flag; /* some flag bits */ short s_flag; /* some flag bits */
addr_t s_base; /* section base */ ADDR_T s_base; /* section base */
addr_t s_size; /* section size */ ADDR_T s_size; /* section size */
addr_t s_comm; /* length of commons */ ADDR_T s_comm; /* length of commons */
addr_t s_zero; /* delayed emit1(0) */ ADDR_T s_zero; /* delayed emit1(0) */
addr_t s_lign; /* section alignment */ ADDR_T s_lign; /* section alignment */
long s_foff; /* section file offset */ long s_foff; /* section file offset */
item_t *s_item; /* points to section name */ item_t *s_item; /* points to section name */
#ifdef THREE_PASS #ifdef THREE_PASS
addr_t s_gain; /* gain in PASS_2 */ ADDR_T s_gain; /* gain in PASS_2 */
#endif #endif
}; };

4
mach/proto/as/comm1.h
View file

@ -67,10 +67,10 @@ extern sect_t sect[SECTMAX];
* specials for the location counter * specials for the location counter
*/ */
extern sect_t *DOTSCT; /* &sect[DOTTYP-S_MIN] or NULL */ extern sect_t *DOTSCT; /* &sect[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 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 item_t *hashtab[H_TOTAL];
extern short hashindex; /* see item_search() */ extern short hashindex; /* see item_search() */

4
mach/proto/as/comm2.y
View file

@ -201,7 +201,7 @@ operation
(short)( (short)(
($4.typ & (S_EXT|S_TYP)) ($4.typ & (S_EXT|S_TYP))
| |
((ushort)$6<<8) ((unsigned short)$6<<8)
), ),
(short)$7, (short)$7,
$4.val $4.val
@ -215,7 +215,7 @@ operation
(short)( (short)(
(DOTTYP & (S_EXT|S_TYP)) (DOTTYP & (S_EXT|S_TYP))
| |
((ushort)$4<<8) ((unsigned short)$4<<8)
), ),
(short)$6, (short)$6,
(valu_t)DOTVAL (valu_t)DOTVAL

2
mach/proto/as/comm4.c
View file

@ -375,7 +375,7 @@ pass_23(n)
{ {
register i; register i;
#ifdef ASLD #ifdef ASLD
register addr_t base = 0; register ADDR_T base = 0;
#endif #endif
register sect_t *sp; register sect_t *sp;

2
mach/proto/as/comm6.c
View file

@ -79,7 +79,7 @@ register item_t *ip;
{ {
#if DEBUG != 0 #if DEBUG != 0
#ifdef THREE_PASS #ifdef THREE_PASS
register addr_t oldval = ip->i_valu; register ADDR_T oldval = ip->i_valu;
#endif #endif
#endif #endif

4
mach/vax4/as/mach0.c
View file

@ -16,8 +16,8 @@
#define valu_t long #define valu_t long
#undef word_t #undef word_t
#define word_t long #define word_t long
#undef addr_t #undef ADDR_T
#define addr_t long #define ADDR_T long
#undef ALIGNWORD #undef ALIGNWORD
#define ALIGNWORD 4 #define ALIGNWORD 4

4
mach/z8000/as/mach0.c
View file

@ -16,5 +16,5 @@
#define ALIGNSECT 2 #define ALIGNSECT 2
#undef valu_t #undef valu_t
#define valu_t long #define valu_t long
#undef addr_t #undef ADDR_T
#define addr_t long #define ADDR_T long