BFD generated headers inconsistency?

[Maciej W. Rozycki]

Hello,

 If I run `make -C bfd headers', I end up with the following diff.  It 
looks like either an incomplete merge or a contamination from someone's 
private changes.  Can someone please resolve it?

  Maciej

diff -up --recursive --new-file binutils-2.15.94-20050202.macro/bfd/bfd-in2.h binutils-2.15.94-20050202/bfd/bfd-in2.h
--- binutils-2.15.94-20050202.macro/bfd/bfd-in2.h	2005-01-28 17:24:38.000000000 +0000
+++ binutils-2.15.94-20050202/bfd/bfd-in2.h	2005-02-11 14:35:40.000000000 +0000
@@ -96,14 +96,6 @@ typedef int bfd_boolean;
 #define FALSE 0
 #define TRUE 1
 
-#if 0
-/* Poison.  */
-#undef false
-#undef true
-#define false dont_use_false_in_bfd
-#define true dont_use_true_in_bfd
-#endif
-
 #ifdef BFD64
 
 #ifndef BFD_HOST_64_BIT