2002-01-29 Daniel Jacobowitz <drow@mvista.com>

        * config/tc-i386.c: Protect definitions of true and false
        from redefinition.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9d98f75ed3f6aef314afaee511601eeaf7c65c36..5ee5bbf73c2f2c25980389181f493a7c790ed7d2 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-29  Daniel Jacobowitz  <drow@mvista.com>
+
+       * config/tc-i386.c: Protect definitions of true and false
+       from redefinition.
+
 2002-01-28  Jakub Jelinek  <jakub@redhat.com>
 
        * config/obj-elf.c (elf_frob_file_before_adjust): Remove symbols

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index c81f87027c90eb81a183709e6225bc020fdb302a..650621feeb2f22d000443cb8ffe4de13e328b1fd 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -48,8 +48,12 @@
 #define SCALE1_WHEN_NO_INDEX 1
 #endif
 
+#ifndef true
 #define true 1
+#endif
+#ifndef false
 #define false 0
+#endif
 
 static unsigned int mode_from_disp_size PARAMS ((unsigned int));
 static int fits_in_signed_byte PARAMS ((offsetT));