Fix T_SHORT macro conflict.

This commit is contained in:
Alan Modra
2000-12-06 02:40:55 +00:00
parent 3c077de93f
commit 50705ef487
2 changed files with 118 additions and 111 deletions

View File

@ -1,3 +1,7 @@
2000-12-06 Mark Elbrecht <snowball3@bigfoot.com>
* config/tc-i386.c (T_SHORT): Undefine before defining.
2000-12-05 Kazu Hirata <kazu@hxi.com> 2000-12-05 Kazu Hirata <kazu@hxi.com>
* config/tc-mips.c: Fix formatting. * config/tc-mips.c: Fix formatting.

View File

@ -4330,7 +4330,9 @@ struct intel_token
static struct intel_token cur_token, prev_token; static struct intel_token cur_token, prev_token;
/* Token codes for the intel parser. */
/* Token codes for the intel parser. Since T_SHORT is already used
by COFF, undefine it first to prevent a warning. */
#define T_NIL -1 #define T_NIL -1
#define T_CONST 1 #define T_CONST 1
#define T_REG 2 #define T_REG 2
@ -4339,6 +4341,7 @@ static struct intel_token cur_token, prev_token;
#define T_DWORD 5 #define T_DWORD 5
#define T_QWORD 6 #define T_QWORD 6
#define T_XWORD 7 #define T_XWORD 7
#undef T_SHORT
#define T_SHORT 8 #define T_SHORT 8
#define T_OFFSET 9 #define T_OFFSET 9
#define T_PTR 10 #define T_PTR 10