This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

macro conflict in i386 COFF


Hi guys,
When building binutils for DJGPP, the macro T_SHORT is defined both in 
include/coff/internals.h and gas/tc-i386.c which causes a warning. Below is my 
suggested fix.

gas/ChangeLog:

2000-12-05  Mark Elbrecht  <snowball3@bigfoot.com>

	* config/tc-i386.c (T_SHORT): Undefine before defining.

Index: src/gas/config/tc-i386.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-i386.c,v
retrieving revision 1.68
diff -c -p -r1.68 tc-i386.c
*** tc-i386.c	2000/12/03 06:49:22	1.68
--- tc-i386.c	2000/12/05 21:54:12
*************** struct intel_token
*** 4330,4336 ****
  
  static struct intel_token cur_token, prev_token;
  
! /* Token codes for the intel parser.  */
  #define T_NIL		-1
  #define T_CONST		1
  #define T_REG		2
--- 4330,4338 ----
  
  static struct intel_token cur_token, prev_token;
  
! 
! /* 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_CONST		1
  #define T_REG		2
*************** static struct intel_token cur_token, pre
*** 4339,4344 ****
--- 4341,4347 ----
  #define	T_DWORD		5
  #define T_QWORD		6
  #define T_XWORD		7
+ #undef  T_SHORT
  #define T_SHORT		8
  #define T_OFFSET	9
  #define T_PTR		10

Mark


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]