Use bool in binutils

	* sysdep.h (POISON_BFD_BOOLEAN): Define.
	* addr2line.c, * ar.c, * arsup.c, * bfdtest2.c, * binemul.c,
	* binemul.h, * bucomm.c, * bucomm.h, * budbg.h, * coffgrok.c,
	* debug.c, * debug.h, * dlltool.c, * dwarf.c, * dwarf.h,
	* elfedit.c, * emul_aix.c, * mclex.c, * nm.c, * objcopy.c,
	* objdump.c, * od-macho.c, * prdbg.c, * rdcoff.c, * rddbg.c,
	* readelf.c, * rename.c, * stabs.c, * strings.c, * windint.h,
	* windmc.c, * windmc.h, * windres.c, * winduni.c,
	* wrstabs.c: Replace bfd_boolean with bool, FALSE with false,
	and TRUE with true throughout.

1 files changed, 194 insertions, 194 deletions

diff --git a/binutils/debug.c b/binutils/debug.c
index b49aef5..9388737 100644
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -111,7 +111,7 @@ struct debug_type_s
       struct debug_indirect_type *kindirect;
       /* DEBUG_KIND_INT.  */
       /* Whether the integer is unsigned.  */
-      bfd_boolean kint;
+      bool kint;
       /* DEBUG_KIND_STRUCT, DEBUG_KIND_UNION, DEBUG_KIND_CLASS,
          DEBUG_KIND_UNION_CLASS.  */
       struct debug_class_type *kclass;
@@ -194,7 +194,7 @@ struct debug_function_type
   /* NULL terminated array of argument types.  */
   debug_type *arg_types;
   /* Whether the function takes a variable number of arguments.  */
-  bfd_boolean varargs;
+  bool varargs;
 };
 
 /* Information kept for a range.  */
@@ -222,7 +222,7 @@ struct debug_array_type
   /* Upper bound.  */
   bfd_signed_vma upper;
   /* Whether this array is really a string.  */
-  bfd_boolean stringp;
+  bool stringp;
 };
 
 /* Information kept for a set.  */
@@ -232,7 +232,7 @@ struct debug_set_type
   /* Base type.  */
   debug_type type;
   /* Whether this set is really a bitstring.  */
-  bfd_boolean bitstringp;
+  bool bitstringp;
 };
 
 /* Information kept for an offset type (a based pointer).  */
@@ -256,7 +256,7 @@ struct debug_method_type
   /* A NULL terminated array of argument types.  */
   debug_type *arg_types;
   /* Whether the method takes a variable number of arguments.  */
-  bfd_boolean varargs;
+  bool varargs;
 };
 
 /* Information kept for a named type.  */
@@ -280,7 +280,7 @@ struct debug_field_s
   /* Visibility of the field.  */
   enum debug_visibility visibility;
   /* Whether this is a static member.  */
-  bfd_boolean static_member;
+  bool static_member;
   union
     {
       /* If static_member is false.  */
@@ -308,7 +308,7 @@ struct debug_baseclass_s
   /* Bit position of the base class in the object.  */
   unsigned int bitpos;
   /* Whether the base class is virtual.  */
-  bfd_boolean is_virtual;
+  bool is_virtual;
   /* Visibility of the base class.  */
   enum debug_visibility visibility;
 };
@@ -335,9 +335,9 @@ struct debug_method_variant_s
   /* The visibility of the function.  */
   enum debug_visibility visibility;
   /* Whether the function is const.  */
-  bfd_boolean constp;
+  bool constp;
   /* Whether the function is volatile.  */
-  bfd_boolean volatilep;
+  bool volatilep;
   /* The offset to the function in the virtual function table.  */
   bfd_vma voffset;
   /* If voffset is VOFFSET_STATIC_METHOD, this is a static method.  */
@@ -565,28 +565,28 @@ static struct debug_type_s *debug_make_type
   (struct debug_handle *, enum debug_type_kind, unsigned int);
 static struct debug_type_s *debug_get_real_type
   (void *, debug_type, struct debug_type_real_list *);
-static bfd_boolean debug_write_name
+static bool debug_write_name
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_name *);
-static bfd_boolean debug_write_type
+static bool debug_write_type
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_type_s *, struct debug_name *);
-static bfd_boolean debug_write_class_type
+static bool debug_write_class_type
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_type_s *, const char *);
-static bfd_boolean debug_write_function
+static bool debug_write_function
   (struct debug_handle *, const struct debug_write_fns *, void *,
    const char *, enum debug_object_linkage, struct debug_function *);
-static bfd_boolean debug_write_block
+static bool debug_write_block
   (struct debug_handle *, const struct debug_write_fns *, void *,
    struct debug_block *);
-static bfd_boolean debug_write_linenos
+static bool debug_write_linenos
   (struct debug_handle *, const struct debug_write_fns *, void *, bfd_vma);
-static bfd_boolean debug_set_class_id
+static bool debug_set_class_id
   (struct debug_handle *, const char *, struct debug_type_s *);
-static bfd_boolean debug_type_samep
+static bool debug_type_samep
   (struct debug_handle *, struct debug_type_s *, struct debug_type_s *);
-static bfd_boolean debug_class_type_samep
+static bool debug_class_type_samep
   (struct debug_handle *, struct debug_type_s *, struct debug_type_s *);
 
 /* Issue an error message.  */
@@ -671,7 +671,7 @@ debug_init (void)
 /* Set the source filename.  This implicitly starts a new compilation
    unit.  */
 
-bfd_boolean
+bool
 debug_set_filename (void *handle, const char *name)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -706,13 +706,13 @@ debug_set_filename (void *handle, const char *name)
   info->current_block = NULL;
   info->current_lineno = NULL;
 
-  return TRUE;
+  return true;
 }
 
 /* Change source files to the given file name.  This is used for
    include files in a single compilation unit.  */
 
-bfd_boolean
+bool
 debug_start_source (void *handle, const char *name)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -724,7 +724,7 @@ debug_start_source (void *handle, const char *name)
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_start_source: no debug_set_filename call"));
-      return FALSE;
+      return false;
     }
 
   for (f = info->current_unit->files; f != NULL; f = f->next)
@@ -732,7 +732,7 @@ debug_start_source (void *handle, const char *name)
       if (filename_cmp (f->filename, name) == 0)
 	{
 	  info->current_file = f;
-	  return TRUE;
+	  return true;
 	}
     }
 
@@ -749,7 +749,7 @@ debug_start_source (void *handle, const char *name)
 
   info->current_file = f;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a function definition.  This implicitly starts a function
@@ -760,9 +760,9 @@ debug_start_source (void *handle, const char *name)
    debug_record_parameter.  FIXME: There is no way to specify nested
    functions.  */
 
-bfd_boolean
+bool
 debug_record_function (void *handle, const char *name,
-		       debug_type return_type, bfd_boolean global,
+		       debug_type return_type, bool global,
 		       bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -773,12 +773,12 @@ debug_record_function (void *handle, const char *name,
   if (name == NULL)
     name = "";
   if (return_type == NULL)
-    return FALSE;
+    return false;
 
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_record_function: no debug_set_filename call"));
-      return FALSE;
+      return false;
     }
 
   f = (struct debug_function *) xmalloc (sizeof *f);
@@ -807,16 +807,16 @@ debug_record_function (void *handle, const char *name,
 			       ? DEBUG_LINKAGE_GLOBAL
 			       : DEBUG_LINKAGE_STATIC));
   if (n == NULL)
-    return FALSE;
+    return false;
 
   n->u.function = f;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a parameter for the current function.  */
 
-bfd_boolean
+bool
 debug_record_parameter (void *handle, const char *name, debug_type type,
 			enum debug_parm_kind kind, bfd_vma val)
 {
@@ -824,13 +824,13 @@ debug_record_parameter (void *handle, const char *name, debug_type type,
   struct debug_parameter *p, **pp;
 
   if (name == NULL || type == NULL)
-    return FALSE;
+    return false;
 
   if (info->current_unit == NULL
       || info->current_function == NULL)
     {
       debug_error (_("debug_record_parameter: no current function"));
-      return FALSE;
+      return false;
     }
 
   p = (struct debug_parameter *) xmalloc (sizeof *p);
@@ -847,12 +847,12 @@ debug_record_parameter (void *handle, const char *name, debug_type type,
     ;
   *pp = p;
 
-  return TRUE;
+  return true;
 }
 
 /* End a function.  FIXME: This should handle function nesting.  */
 
-bfd_boolean
+bool
 debug_end_function (void *handle, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -862,13 +862,13 @@ debug_end_function (void *handle, bfd_vma addr)
       || info->current_function == NULL)
     {
       debug_error (_("debug_end_function: no current function"));
-      return FALSE;
+      return false;
     }
 
   if (info->current_block->parent != NULL)
     {
       debug_error (_("debug_end_function: some blocks were not closed"));
-      return FALSE;
+      return false;
     }
 
   info->current_block->end = addr;
@@ -876,7 +876,7 @@ debug_end_function (void *handle, bfd_vma addr)
   info->current_function = NULL;
   info->current_block = NULL;
 
-  return TRUE;
+  return true;
 }
 
 /* Start a block in a function.  All local information will be
@@ -884,7 +884,7 @@ debug_end_function (void *handle, bfd_vma addr)
    debug_start_block and debug_end_block may be nested.  The bfd_vma
    argument is the address at which this block starts.  */
 
-bfd_boolean
+bool
 debug_start_block (void *handle, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -896,7 +896,7 @@ debug_start_block (void *handle, bfd_vma addr)
       || info->current_block == NULL)
     {
       debug_error (_("debug_start_block: no current block"));
-      return FALSE;
+      return false;
     }
 
   b = (struct debug_block *) xmalloc (sizeof *b);
@@ -915,14 +915,14 @@ debug_start_block (void *handle, bfd_vma addr)
 
   info->current_block = b;
 
-  return TRUE;
+  return true;
 }
 
 /* Finish a block in a function.  This matches the call to
    debug_start_block.  The argument is the address at which this block
    ends.  */
 
-bfd_boolean
+bool
 debug_end_block (void *handle, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -932,27 +932,27 @@ debug_end_block (void *handle, bfd_vma addr)
       || info->current_block == NULL)
     {
       debug_error (_("debug_end_block: no current block"));
-      return FALSE;
+      return false;
     }
 
   parent = info->current_block->parent;
   if (parent == NULL)
     {
       debug_error (_("debug_end_block: attempt to close top level block"));
-      return FALSE;
+      return false;
     }
 
   info->current_block->end = addr;
 
   info->current_block = parent;
 
-  return TRUE;
+  return true;
 }
 
 /* Associate a line number in the current source file and function
    with a given address.  */
 
-bfd_boolean
+bool
 debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -962,7 +962,7 @@ debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
   if (info->current_unit == NULL)
     {
       debug_error (_("debug_record_line: no current unit"));
-      return FALSE;
+      return false;
     }
 
   l = info->current_lineno;
@@ -974,7 +974,7 @@ debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
 	    {
 	      l->linenos[i] = lineno;
 	      l->addrs[i] = addr;
-	      return TRUE;
+	      return true;
 	    }
 	}
     }
@@ -1003,77 +1003,77 @@ debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)
 
   info->current_lineno = l;
 
-  return TRUE;
+  return true;
 }
 
 /* Start a named common block.  This is a block of variables that may
    move in memory.  */
 
-bfd_boolean
+bool
 debug_start_common_block (void *handle ATTRIBUTE_UNUSED,
 			  const char *name ATTRIBUTE_UNUSED)
 {
   /* FIXME */
   debug_error (_("debug_start_common_block: not implemented"));
-  return FALSE;
+  return false;
 }
 
 /* End a named common block.  */
 
-bfd_boolean
+bool
 debug_end_common_block (void *handle ATTRIBUTE_UNUSED,
 			const char *name ATTRIBUTE_UNUSED)
 {
   /* FIXME */
   debug_error (_("debug_end_common_block: not implemented"));
-  return FALSE;
+  return false;
 }
 
 /* Record a named integer constant.  */
 
-bfd_boolean
+bool
 debug_record_int_const (void *handle, const char *name, bfd_vma val)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;
 
   if (name == NULL)
-    return FALSE;
+    return false;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_INT_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   n->u.int_constant = val;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a named floating point constant.  */
 
-bfd_boolean
+bool
 debug_record_float_const (void *handle, const char *name, double val)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;
 
   if (name == NULL)
-    return FALSE;
+    return false;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_FLOAT_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   n->u.float_constant = val;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a typed constant with an integral value.  */
 
-bfd_boolean
+bool
 debug_record_typed_const (void *handle, const char *name, debug_type type,
 			  bfd_vma val)
 {
@@ -1082,12 +1082,12 @@ debug_record_typed_const (void *handle, const char *name, debug_type type,
   struct debug_typed_constant *tc;
 
   if (name == NULL || type == NULL)
-    return FALSE;
+    return false;
 
   n = debug_add_to_current_namespace (info, name, DEBUG_OBJECT_TYPED_CONSTANT,
 				      DEBUG_LINKAGE_NONE);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   tc = (struct debug_typed_constant *) xmalloc (sizeof *tc);
   memset (tc, 0, sizeof *tc);
@@ -1097,12 +1097,12 @@ debug_record_typed_const (void *handle, const char *name, debug_type type,
 
   n->u.typed_constant = tc;
 
-  return TRUE;
+  return true;
 }
 
 /* Record a label.  */
 
-bfd_boolean
+bool
 debug_record_label (void *handle ATTRIBUTE_UNUSED,
 		    const char *name ATTRIBUTE_UNUSED,
 		    debug_type type ATTRIBUTE_UNUSED,
@@ -1110,12 +1110,12 @@ debug_record_label (void *handle ATTRIBUTE_UNUSED,
 {
   /* FIXME.  */
   debug_error (_("debug_record_label: not implemented"));
-  return FALSE;
+  return false;
 }
 
 /* Record a variable.  */
 
-bfd_boolean
+bool
 debug_record_variable (void *handle, const char *name, debug_type type,
 		       enum debug_var_kind kind, bfd_vma val)
 {
@@ -1126,13 +1126,13 @@ debug_record_variable (void *handle, const char *name, debug_type type,
   struct debug_variable *v;
 
   if (name == NULL || type == NULL)
-    return FALSE;
+    return false;
 
   if (info->current_unit == NULL
       || info->current_file == NULL)
     {
       debug_error (_("debug_record_variable: no current file"));
-      return FALSE;
+      return false;
     }
 
   if (kind == DEBUG_GLOBAL || kind == DEBUG_STATIC)
@@ -1154,7 +1154,7 @@ debug_record_variable (void *handle, const char *name, debug_type type,
 
   n = debug_add_to_namespace (info, nsp, name, DEBUG_OBJECT_VARIABLE, linkage);
   if (n == NULL)
-    return FALSE;
+    return false;
 
   v = (struct debug_variable *) xmalloc (sizeof *v);
   memset (v, 0, sizeof *v);
@@ -1165,7 +1165,7 @@ debug_record_variable (void *handle, const char *name, debug_type type,
 
   n->u.variable = v;
 
-  return TRUE;
+  return true;
 }
 
 /* Make a type with a given kind and size.  */
@@ -1224,7 +1224,7 @@ debug_make_void_type (void *handle)
    if the integer is unsigned.  */
 
 debug_type
-debug_make_int_type (void *handle, unsigned int size, bfd_boolean unsignedp)
+debug_make_int_type (void *handle, unsigned int size, bool unsignedp)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1275,7 +1275,7 @@ debug_make_complex_type (void *handle, unsigned int size)
    The fourth argument is a NULL terminated array of fields.  */
 
 debug_type
-debug_make_struct_type (void *handle, bfd_boolean structp, bfd_vma size,
+debug_make_struct_type (void *handle, bool structp, bfd_vma size,
 			debug_field *fields)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -1306,10 +1306,10 @@ debug_make_struct_type (void *handle, bfd_boolean structp, bfd_vma size,
    object has its own virtual function table.  */
 
 debug_type
-debug_make_object_type (void *handle, bfd_boolean structp, bfd_vma size,
+debug_make_object_type (void *handle, bool structp, bfd_vma size,
 			debug_field *fields, debug_baseclass *baseclasses,
 			debug_method *methods, debug_type vptrbase,
-			bfd_boolean ownvptr)
+			bool ownvptr)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1393,7 +1393,7 @@ debug_make_pointer_type (void *handle, debug_type type)
 
 debug_type
 debug_make_function_type (void *handle, debug_type type,
-			  debug_type *arg_types, bfd_boolean varargs)
+			  debug_type *arg_types, bool varargs)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1476,7 +1476,7 @@ debug_make_range_type (void *handle, debug_type type, bfd_signed_vma lower,
 debug_type
 debug_make_array_type (void *handle, debug_type element_type,
 		       debug_type range_type, bfd_signed_vma lower,
-		       bfd_signed_vma upper, bfd_boolean stringp)
+		       bfd_signed_vma upper, bool stringp)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1508,7 +1508,7 @@ debug_make_array_type (void *handle, debug_type element_type,
    CHILL.  */
 
 debug_type
-debug_make_set_type (void *handle, debug_type type, bfd_boolean bitstringp)
+debug_make_set_type (void *handle, debug_type type, bool bitstringp)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1570,7 +1570,7 @@ debug_make_offset_type (void *handle, debug_type base_type,
 debug_type
 debug_make_method_type (void *handle, debug_type return_type,
 			debug_type domain_type, debug_type *arg_types,
-			bfd_boolean varargs)
+			bool varargs)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_type_s *t;
@@ -1678,7 +1678,7 @@ debug_make_undefined_tagged_type (void *handle, const char *name,
 
 debug_baseclass
 debug_make_baseclass (void *handle ATTRIBUTE_UNUSED, debug_type type,
-		      bfd_vma bitpos, bfd_boolean is_virtual,
+		      bfd_vma bitpos, bool is_virtual,
 		      enum debug_visibility visibility)
 {
   struct debug_baseclass_s *b;
@@ -1712,7 +1712,7 @@ debug_make_field (void *handle ATTRIBUTE_UNUSED, const char *name,
 
   f->name = name;
   f->type = type;
-  f->static_member = FALSE;
+  f->static_member = false;
   f->u.f.bitpos = bitpos;
   f->u.f.bitsize = bitsize;
   f->visibility = visibility;
@@ -1738,7 +1738,7 @@ debug_make_static_member (void *handle ATTRIBUTE_UNUSED, const char *name,
 
   f->name = name;
   f->type = type;
-  f->static_member = TRUE;
+  f->static_member = true;
   f->u.s.physname = physname;
   f->visibility = visibility;
 
@@ -1776,7 +1776,7 @@ debug_method_variant
 debug_make_method_variant (void *handle ATTRIBUTE_UNUSED,
 			   const char *physname, debug_type type,
 			   enum debug_visibility visibility,
-			   bfd_boolean constp, bfd_boolean volatilep,
+			   bool constp, bool volatilep,
 			   bfd_vma voffset, debug_type context)
 {
   struct debug_method_variant_s *m;
@@ -1803,7 +1803,7 @@ debug_method_variant
 debug_make_static_method_variant (void *handle ATTRIBUTE_UNUSED,
 				  const char *physname, debug_type type,
 				  enum debug_visibility visibility,
-				  bfd_boolean constp, bfd_boolean volatilep)
+				  bool constp, bool volatilep)
 {
   struct debug_method_variant_s *m;
 
@@ -1921,7 +1921,7 @@ debug_tag_type (void *handle, const char *name, debug_type type)
 
 /* Record the size of a given type.  */
 
-bfd_boolean
+bool
 debug_record_type_size (void *handle ATTRIBUTE_UNUSED, debug_type type,
 			unsigned int size)
 {
@@ -1931,7 +1931,7 @@ debug_record_type_size (void *handle ATTRIBUTE_UNUSED, debug_type type,
 
   type->size = size;
 
-  return TRUE;
+  return true;
 }
 
 /* Find a named type.  */
@@ -2163,7 +2163,7 @@ debug_get_return_type (void *handle, debug_type type)
 
 const debug_type *
 debug_get_parameter_types (void *handle, debug_type type,
-			   bfd_boolean *pvarargs)
+			   bool *pvarargs)
 {
   if (type == NULL)
     return NULL;
@@ -2303,7 +2303,7 @@ debug_get_field_physname (void *handle ATTRIBUTE_UNUSED, debug_field field)
 /* Write out the debugging information.  This is given a handle to
    debugging information, and a set of function pointers to call.  */
 
-bfd_boolean
+bool
 debug_write (void *handle, const struct debug_write_fns *fns, void *fhandle)
 {
   struct debug_handle *info = (struct debug_handle *) handle;
@@ -2327,42 +2327,42 @@ debug_write (void *handle, const struct debug_write_fns *fns, void *fhandle)
   for (u = info->units; u != NULL; u = u->next)
     {
       struct debug_file *f;
-      bfd_boolean first_file;
+      bool first_file;
 
       info->current_write_lineno = u->linenos;
       info->current_write_lineno_index = 0;
 
       if (! (*fns->start_compilation_unit) (fhandle, u->files->filename))
-	return FALSE;
+	return false;
 
-      first_file = TRUE;
+      first_file = true;
       for (f = u->files; f != NULL; f = f->next)
 	{
 	  struct debug_name *n;
 
 	  if (first_file)
-	    first_file = FALSE;
+	    first_file = false;
 	  else if (! (*fns->start_source) (fhandle, f->filename))
-	    return FALSE;
+	    return false;
 
 	  if (f->globals != NULL)
 	    for (n = f->globals->list; n != NULL; n = n->next)
 	      if (! debug_write_name (info, fns, fhandle, n))
-		return FALSE;
+		return false;
 	}
 
       /* Output any line number information which hasn't already been
          handled.  */
       if (! debug_write_linenos (info, fns, fhandle, (bfd_vma) -1))
-	return FALSE;
+	return false;
     }
 
-  return TRUE;
+  return true;
 }
 
 /* Write out an element in a namespace.  */
 
-static bfd_boolean
+static bool
 debug_write_name (struct debug_handle *info,
 		  const struct debug_write_fns *fns, void *fhandle,
 		  struct debug_name *n)
@@ -2372,16 +2372,16 @@ debug_write_name (struct debug_handle *info,
     case DEBUG_OBJECT_TYPE:
       if (! debug_write_type (info, fns, fhandle, n->u.type, n)
 	  || ! (*fns->typdef) (fhandle, n->name))
-	return FALSE;
-      return TRUE;
+	return false;
+      return true;
     case DEBUG_OBJECT_TAG:
       if (! debug_write_type (info, fns, fhandle, n->u.tag, n))
-	return FALSE;
+	return false;
       return (*fns->tag) (fhandle, n->name);
     case DEBUG_OBJECT_VARIABLE:
       if (! debug_write_type (info, fns, fhandle, n->u.variable->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->variable) (fhandle, n->name, n->u.variable->kind,
 			       n->u.variable->val);
     case DEBUG_OBJECT_FUNCTION:
@@ -2394,12 +2394,12 @@ debug_write_name (struct debug_handle *info,
     case DEBUG_OBJECT_TYPED_CONSTANT:
       if (! debug_write_type (info, fns, fhandle, n->u.typed_constant->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->typed_constant) (fhandle, n->name,
 				     n->u.typed_constant->val);
     default:
       abort ();
-      return FALSE;
+      return false;
     }
   /*NOTREACHED*/
 }
@@ -2410,7 +2410,7 @@ debug_write_name (struct debug_handle *info,
    then the name argument is a tag from a DEBUG_KIND_TAGGED type which
    points to this one.  */
 
-static bfd_boolean
+static bool
 debug_write_type (struct debug_handle *info,
 		  const struct debug_write_fns *fns, void *fhandle,
 		  struct debug_type_s *type, struct debug_name *name)
@@ -2453,7 +2453,7 @@ debug_write_type (struct debug_handle *info,
 		  if (! debug_set_class_id (info,
 					    type->u.knamed->name->name,
 					    real))
-		    return FALSE;
+		    return false;
 		}
 	      id = real->u.kclass->id;
 	    }
@@ -2482,7 +2482,7 @@ debug_write_type (struct debug_handle *info,
     {
     case DEBUG_KIND_ILLEGAL:
       debug_error (_("debug_write_type: illegal type encountered"));
-      return FALSE;
+      return false;
     case DEBUG_KIND_INDIRECT:
       return debug_write_type (info, fns, fhandle, *type->u.kindirect->slot,
 			       name);
@@ -2503,7 +2503,7 @@ debug_write_type (struct debug_handle *info,
 	  if (type->u.kclass->id <= info->base_id)
 	    {
 	      if (! debug_set_class_id (info, tag, type))
-		return FALSE;
+		return false;
 	    }
 
 	  if (info->mark == type->u.kclass->mark)
@@ -2524,7 +2524,7 @@ debug_write_type (struct debug_handle *info,
 					: 0),
 				       type->kind == DEBUG_KIND_STRUCT,
 				       type->size))
-	return FALSE;
+	return false;
       if (type->u.kclass != NULL
 	  && type->u.kclass->fields != NULL)
 	{
@@ -2537,7 +2537,7 @@ debug_write_type (struct debug_handle *info,
 				      (struct debug_name *) NULL)
 		  || ! (*fns->struct_field) (fhandle, f->name, f->u.f.bitpos,
 					     f->u.f.bitsize, f->visibility))
-		return FALSE;
+		return false;
 	    }
 	}
       return (*fns->end_struct_type) (fhandle);
@@ -2553,13 +2553,13 @@ debug_write_type (struct debug_handle *info,
     case DEBUG_KIND_POINTER:
       if (! debug_write_type (info, fns, fhandle, type->u.kpointer,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->pointer_type) (fhandle);
     case DEBUG_KIND_FUNCTION:
       if (! debug_write_type (info, fns, fhandle,
 			      type->u.kfunction->return_type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       if (type->u.kfunction->arg_types == NULL)
 	is = -1;
       else
@@ -2568,19 +2568,19 @@ debug_write_type (struct debug_handle *info,
 	    if (! debug_write_type (info, fns, fhandle,
 				    type->u.kfunction->arg_types[is],
 				    (struct debug_name *) NULL))
-	      return FALSE;
+	      return false;
 	}
       return (*fns->function_type) (fhandle, is,
 				    type->u.kfunction->varargs);
     case DEBUG_KIND_REFERENCE:
       if (! debug_write_type (info, fns, fhandle, type->u.kreference,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->reference_type) (fhandle);
     case DEBUG_KIND_RANGE:
       if (! debug_write_type (info, fns, fhandle, type->u.krange->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->range_type) (fhandle, type->u.krange->lower,
 				 type->u.krange->upper);
     case DEBUG_KIND_ARRAY:
@@ -2589,14 +2589,14 @@ debug_write_type (struct debug_handle *info,
 	  || ! debug_write_type (info, fns, fhandle,
 				 type->u.karray->range_type,
 				 (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->array_type) (fhandle, type->u.karray->lower,
 				 type->u.karray->upper,
 				 type->u.karray->stringp);
     case DEBUG_KIND_SET:
       if (! debug_write_type (info, fns, fhandle, type->u.kset->type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->set_type) (fhandle, type->u.kset->bitstringp);
     case DEBUG_KIND_OFFSET:
       if (! debug_write_type (info, fns, fhandle, type->u.koffset->base_type,
@@ -2604,13 +2604,13 @@ debug_write_type (struct debug_handle *info,
 	  || ! debug_write_type (info, fns, fhandle,
 				 type->u.koffset->target_type,
 				 (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->offset_type) (fhandle);
     case DEBUG_KIND_METHOD:
       if (! debug_write_type (info, fns, fhandle,
 			      type->u.kmethod->return_type,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       if (type->u.kmethod->arg_types == NULL)
 	is = -1;
       else
@@ -2619,14 +2619,14 @@ debug_write_type (struct debug_handle *info,
 	    if (! debug_write_type (info, fns, fhandle,
 				    type->u.kmethod->arg_types[is],
 				    (struct debug_name *) NULL))
-	      return FALSE;
+	      return false;
 	}
       if (type->u.kmethod->domain_type != NULL)
 	{
 	  if (! debug_write_type (info, fns, fhandle,
 				  type->u.kmethod->domain_type,
 				  (struct debug_name *) NULL))
-	    return FALSE;
+	    return false;
 	}
       return (*fns->method_type) (fhandle,
 				  type->u.kmethod->domain_type != NULL,
@@ -2635,12 +2635,12 @@ debug_write_type (struct debug_handle *info,
     case DEBUG_KIND_CONST:
       if (! debug_write_type (info, fns, fhandle, type->u.kconst,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->const_type) (fhandle);
     case DEBUG_KIND_VOLATILE:
       if (! debug_write_type (info, fns, fhandle, type->u.kvolatile,
 			      (struct debug_name *) NULL))
-	return FALSE;
+	return false;
       return (*fns->volatile_type) (fhandle);
     case DEBUG_KIND_NAMED:
       return debug_write_type (info, fns, fhandle, type->u.knamed->type,
@@ -2650,13 +2650,13 @@ debug_write_type (struct debug_handle *info,
 			       type->u.knamed->name);
     default:
       abort ();
-      return FALSE;
+      return false;
     }
 }
 
 /* Write out a class type.  */
 
-static bfd_boolean
+static bool
 debug_write_class_type (struct debug_handle *info,
 			const struct debug_write_fns *fns, void *fhandle,
 			struct debug_type_s *type, const char *tag)
@@ -2675,7 +2675,7 @@ debug_write_class_type (struct debug_handle *info,
       if (type->u.kclass->id <= info->base_id)
 	{
 	  if (! debug_set_class_id (info, tag, type))
-	    return FALSE;
+	    return false;
 	}
 
       if (info->mark == type->u.kclass->mark)
@@ -2695,7 +2695,7 @@ debug_write_class_type (struct debug_handle *info,
 	{
 	  if (! debug_write_type (info, fns, fhandle, vptrbase,
 				  (struct debug_name *) NULL))
-	    return FALSE;
+	    return false;
 	}
     }
 
@@ -2704,7 +2704,7 @@ debug_write_class_type (struct debug_handle *info,
 				  type->size,
 				  vptrbase != NULL,
 				  vptrbase == type))
-    return FALSE;
+    return false;
 
   if (type->u.kclass != NULL)
     {
@@ -2717,19 +2717,19 @@ debug_write_class_type (struct debug_handle *info,
 	      f = type->u.kclass->fields[i];
 	      if (! debug_write_type (info, fns, fhandle, f->type,
 				      (struct debug_name *) NULL))
-		return FALSE;
+		return false;
 	      if (f->static_member)
 		{
 		  if (! (*fns->class_static_member) (fhandle, f->name,
 						     f->u.s.physname,
 						     f->visibility))
-		    return FALSE;
+		    return false;
 		}
 	      else
 		{
 		  if (! (*fns->struct_field) (fhandle, f->name, f->u.f.bitpos,
 					      f->u.f.bitsize, f->visibility))
-		    return FALSE;
+		    return false;
 		}
 	    }
 	}
@@ -2743,10 +2743,10 @@ debug_write_class_type (struct debug_handle *info,
 	      b = type->u.kclass->baseclasses[i];
 	      if (! debug_write_type (info, fns, fhandle, b->type,
 				      (struct debug_name *) NULL))
-		return FALSE;
+		return false;
 	      if (! (*fns->class_baseclass) (fhandle, b->bitpos, b->is_virtual,
 					     b->visibility))
-		return FALSE;
+		return false;
 	    }
 	}
 
@@ -2759,7 +2759,7 @@ debug_write_class_type (struct debug_handle *info,
 
 	      m = type->u.kclass->methods[i];
 	      if (! (*fns->class_start_method) (fhandle, m->name))
-		return FALSE;
+		return false;
 	      for (j = 0; m->variants[j] != NULL; j++)
 		{
 		  struct debug_method_variant_s *v;
@@ -2769,11 +2769,11 @@ debug_write_class_type (struct debug_handle *info,
 		    {
 		      if (! debug_write_type (info, fns, fhandle, v->context,
 					      (struct debug_name *) NULL))
-			return FALSE;
+			return false;
 		    }
 		  if (! debug_write_type (info, fns, fhandle, v->type,
 					  (struct debug_name *) NULL))
-		    return FALSE;
+		    return false;
 		  if (v->voffset != VOFFSET_STATIC_METHOD)
 		    {
 		      if (! (*fns->class_method_variant) (fhandle, v->physname,
@@ -2782,7 +2782,7 @@ debug_write_class_type (struct debug_handle *info,
 							  v->volatilep,
 							  v->voffset,
 							  v->context != NULL))
-			return FALSE;
+			return false;
 		    }
 		  else
 		    {
@@ -2791,11 +2791,11 @@ debug_write_class_type (struct debug_handle *info,
 								 v->visibility,
 								 v->constp,
 								 v->volatilep))
-			return FALSE;
+			return false;
 		    }
 		}
 	      if (! (*fns->class_end_method) (fhandle))
-		return FALSE;
+		return false;
 	    }
 	}
     }
@@ -2805,7 +2805,7 @@ debug_write_class_type (struct debug_handle *info,
 
 /* Write out information for a function.  */
 
-static bfd_boolean
+static bool
 debug_write_function (struct debug_handle *info,
 		      const struct debug_write_fns *fns, void *fhandle,
 		      const char *name, enum debug_object_linkage linkage,
@@ -2815,28 +2815,28 @@ debug_write_function (struct debug_handle *info,
   struct debug_block *b;
 
   if (! debug_write_linenos (info, fns, fhandle, function->blocks->start))
-    return FALSE;
+    return false;
 
   if (! debug_write_type (info, fns, fhandle, function->return_type,
 			  (struct debug_name *) NULL))
-    return FALSE;
+    return false;
 
   if (! (*fns->start_function) (fhandle, name,
 				linkage == DEBUG_LINKAGE_GLOBAL))
-    return FALSE;
+    return false;
 
   for (p = function->parameters; p != NULL; p = p->next)
     {
       if (! debug_write_type (info, fns, fhandle, p->type,
 			      (struct debug_name *) NULL)
 	  || ! (*fns->function_parameter) (fhandle, p->name, p->kind, p->val))
-	return FALSE;
+	return false;
     }
 
   for (b = function->blocks; b != NULL; b = b->next)
     {
       if (! debug_write_block (info, fns, fhandle, b))
-	return FALSE;
+	return false;
     }
 
   return (*fns->end_function) (fhandle);
@@ -2844,7 +2844,7 @@ debug_write_function (struct debug_handle *info,
 
 /* Write out information for a block.  */
 
-static bfd_boolean
+static bool
 debug_write_block (struct debug_handle *info,
 		   const struct debug_write_fns *fns, void *fhandle,
 		   struct debug_block *block)
@@ -2853,14 +2853,14 @@ debug_write_block (struct debug_handle *info,
   struct debug_block *b;
 
   if (! debug_write_linenos (info, fns, fhandle, block->start))
-    return FALSE;
+    return false;
 
   /* I can't see any point to writing out a block with no local
      variables, so we don't bother, except for the top level block.  */
   if (block->locals != NULL || block->parent == NULL)
     {
       if (! (*fns->start_block) (fhandle, block->start))
-	return FALSE;
+	return false;
     }
 
   if (block->locals != NULL)
@@ -2868,31 +2868,31 @@ debug_write_block (struct debug_handle *info,
       for (n = block->locals->list; n != NULL; n = n->next)
 	{
 	  if (! debug_write_name (info, fns, fhandle, n))
-	    return FALSE;
+	    return false;
 	}
     }
 
   for (b = block->children; b != NULL; b = b->next)
     {
       if (! debug_write_block (info, fns, fhandle, b))
-	return FALSE;
+	return false;
     }
 
   if (! debug_write_linenos (info, fns, fhandle, block->end))
-    return FALSE;
+    return false;
 
   if (block->locals != NULL || block->parent == NULL)
     {
       if (! (*fns->end_block) (fhandle, block->end))
-	return FALSE;
+	return false;
     }
 
-  return TRUE;
+  return true;
 }
 
 /* Write out line number information up to ADDRESS.  */
 
-static bfd_boolean
+static bool
 debug_write_linenos (struct debug_handle *info,
 		     const struct debug_write_fns *fns, void *fhandle,
 		     bfd_vma address)
@@ -2910,12 +2910,12 @@ debug_write_linenos (struct debug_handle *info,
 	    break;
 
 	  if (l->addrs[info->current_write_lineno_index] >= address)
-	    return TRUE;
+	    return true;
 
 	  if (! (*fns->lineno) (fhandle, l->file->filename,
 				l->linenos[info->current_write_lineno_index],
 				l->addrs[info->current_write_lineno_index]))
-	    return FALSE;
+	    return false;
 
 	  ++info->current_write_lineno_index;
 	}
@@ -2924,7 +2924,7 @@ debug_write_linenos (struct debug_handle *info,
       info->current_write_lineno_index = 0;
     }
 
-  return TRUE;
+  return true;
 }
 
 /* Get the ID number for a class.  If during the same call to
@@ -2932,7 +2932,7 @@ debug_write_linenos (struct debug_handle *info,
    name, we use the same ID.  This type of things happens because the
    same struct will be defined by multiple compilation units.  */
 
-static bfd_boolean
+static bool
 debug_set_class_id (struct debug_handle *info, const char *tag,
 		    struct debug_type_s *type)
 {
@@ -2947,7 +2947,7 @@ debug_set_class_id (struct debug_handle *info, const char *tag,
   c = type->u.kclass;
 
   if (c->id > info->base_id)
-    return TRUE;
+    return true;
 
   for (l = info->id_list; l != NULL; l = l->next)
     {
@@ -2970,7 +2970,7 @@ debug_set_class_id (struct debug_handle *info, const char *tag,
       if (debug_type_samep (info, l->type, type))
 	{
 	  c->id = l->type->u.kclass->id;
-	  return TRUE;
+	  return true;
 	}
     }
 
@@ -2988,40 +2988,40 @@ debug_set_class_id (struct debug_handle *info, const char *tag,
   l->next = info->id_list;
   info->id_list = l;
 
-  return TRUE;
+  return true;
 }
 
 /* See if two types are the same.  At this point, we don't care about
    tags and the like.  */
 
-static bfd_boolean
+static bool
 debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 		  struct debug_type_s *t2)
 {
   struct debug_type_compare_list *l;
   struct debug_type_compare_list top;
-  bfd_boolean ret;
+  bool ret;
 
   if (t1 == NULL)
     return t2 == NULL;
   if (t2 == NULL)
-    return FALSE;
+    return false;
 
   while (t1->kind == DEBUG_KIND_INDIRECT)
     {
       t1 = *t1->u.kindirect->slot;
       if (t1 == NULL)
-	return FALSE;
+	return false;
     }
   while (t2->kind == DEBUG_KIND_INDIRECT)
     {
       t2 = *t2->u.kindirect->slot;
       if (t2 == NULL)
-	return FALSE;
+	return false;
     }
 
   if (t1 == t2)
-    return TRUE;
+    return true;
 
   /* As a special case, permit a typedef to match a tag, since C++
      debugging output will sometimes add a typedef where C debugging
@@ -3035,7 +3035,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 
   if (t1->kind != t2->kind
       || t1->size != t2->size)
-    return FALSE;
+    return false;
 
   /* Get rid of the trivial cases first.  */
   switch (t1->kind)
@@ -3046,7 +3046,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
     case DEBUG_KIND_FLOAT:
     case DEBUG_KIND_COMPLEX:
     case DEBUG_KIND_BOOL:
-      return TRUE;
+      return true;
     case DEBUG_KIND_INT:
       return t1->u.kint == t2->u.kint;
     }
@@ -3058,7 +3058,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
   for (l = info->compare_list; l != NULL; l = l->next)
     {
       if (l->t1 == t1 && l->t2 == t2)
-	return TRUE;
+	return true;
     }
 
   top.t1 = t1;
@@ -3070,7 +3070,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
     {
     default:
       abort ();
-      ret = FALSE;
+      ret = false;
       break;
 
     case DEBUG_KIND_STRUCT:
@@ -3080,10 +3080,10 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
       if (t1->u.kclass == NULL)
 	ret = t2->u.kclass == NULL;
       else if (t2->u.kclass == NULL)
-	ret = FALSE;
+	ret = false;
       else if (t1->u.kclass->id > info->base_id
 	       && t1->u.kclass->id == t2->u.kclass->id)
-	ret = TRUE;
+	ret = true;
       else
 	ret = debug_class_type_samep (info, t1, t2);
       break;
@@ -3092,7 +3092,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
       if (t1->u.kenum == NULL)
 	ret = t2->u.kenum == NULL;
       else if (t2->u.kenum == NULL)
-	ret = FALSE;
+	ret = false;
       else
 	{
 	  const char **pn1, **pn2;
@@ -3127,9 +3127,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 				 t2->u.kfunction->return_type)
 	  || ((t1->u.kfunction->arg_types == NULL)
 	      != (t2->u.kfunction->arg_types == NULL)))
-	ret = FALSE;
+	ret = false;
       else if (t1->u.kfunction->arg_types == NULL)
-	ret = TRUE;
+	ret = true;
       else
 	{
 	  struct debug_type_s **a1, **a2;
@@ -3186,9 +3186,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 				 t2->u.kmethod->domain_type)
 	  || ((t1->u.kmethod->arg_types == NULL)
 	      != (t2->u.kmethod->arg_types == NULL)))
-	ret = FALSE;
+	ret = false;
       else if (t1->u.kmethod->arg_types == NULL)
-	ret = TRUE;
+	ret = true;
       else
 	{
 	  struct debug_type_s **a1, **a2;
@@ -3230,7 +3230,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 /* See if two classes are the same.  This is a subroutine of
    debug_type_samep.  */
 
-static bfd_boolean
+static bool
 debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 			struct debug_type_s *t2)
 {
@@ -3243,7 +3243,7 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
       || (c1->baseclasses == NULL) != (c2->baseclasses == NULL)
       || (c1->methods == NULL) != (c2->methods == NULL)
       || (c1->vptrbase == NULL) != (c2->vptrbase == NULL))
-    return FALSE;
+    return false;
 
   if (c1->fields != NULL)
     {
@@ -3260,17 +3260,17 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 	  if (f1->name[0] != f2->name[0]
 	      || f1->visibility != f2->visibility
 	      || f1->static_member != f2->static_member)
-	    return FALSE;
+	    return false;
 	  if (f1->static_member)
 	    {
 	      if (strcmp (f1->u.s.physname, f2->u.s.physname) != 0)
-		return FALSE;
+		return false;
 	    }
 	  else
 	    {
 	      if (f1->u.f.bitpos != f2->u.f.bitpos
 		  || f1->u.f.bitsize != f2->u.f.bitsize)
-		return FALSE;
+		return false;
 	    }
 	  /* We do the checks which require function calls last.  We
              don't require that the types of fields have the same
@@ -3284,16 +3284,16 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 							  f1->type, NULL),
 				     debug_get_real_type ((void *) info,
 							  f2->type, NULL)))
-	    return FALSE;
+	    return false;
 	}
       if (*pf1 != NULL || *pf2 != NULL)
-	return FALSE;
+	return false;
     }
 
   if (c1->vptrbase != NULL)
     {
       if (! debug_type_samep (info, c1->vptrbase, c2->vptrbase))
-	return FALSE;
+	return false;
     }
 
   if (c1->baseclasses != NULL)
@@ -3312,10 +3312,10 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 	      || b1->is_virtual != b2->is_virtual
 	      || b1->visibility != b2->visibility
 	      || ! debug_type_samep (info, b1->type, b2->type))
-	    return FALSE;
+	    return false;
 	}
       if (*pb1 != NULL || *pb2 != NULL)
-	return FALSE;
+	return false;
     }
 
   if (c1->methods != NULL)
@@ -3333,7 +3333,7 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 	  if (m1->name[0] != m2->name[0]
 	      || strcmp (m1->name, m2->name) != 0
 	      || (m1->variants == NULL) != (m2->variants == NULL))
-	    return FALSE;
+	    return false;
 	  if (m1->variants == NULL)
 	    {
 	      struct debug_method_variant_s **pv1, **pv2;
@@ -3354,21 +3354,21 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
 		      || (v1->context == NULL) != (v2->context == NULL)
 		      || strcmp (v1->physname, v2->physname) != 0
 		      || ! debug_type_samep (info, v1->type, v2->type))
-		    return FALSE;
+		    return false;
 		  if (v1->context != NULL)
 		    {
 		      if (! debug_type_samep (info, v1->context,
 					      v2->context))
-			return FALSE;
+			return false;
 		    }
 		}
 	      if (*pv1 != NULL || *pv2 != NULL)
-		return FALSE;
+		return false;
 	    }
 	}
       if (*pm1 != NULL || *pm2 != NULL)
-	return FALSE;
+	return false;
     }
 
-  return TRUE;
+  return true;
 }