s/boolean/bfd_boolean/ s/true/TRUE/ s/false/FALSE/. Simplify

comparisons of bfd_boolean vars with TRUE/FALSE.  Formatting.

8 files changed, 127 insertions, 129 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index ffe4702..89ab8d8 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h: Replace boolean with bfd_boolean.  Formatting.
+
 2002-11-23  Simon Burge  <simonb@wasabisystems.com>
 
 	* libiberty.h (basename): Add NetBSD to the list.
diff --git a/include/bfdlink.h b/include/bfdlink.h
index 9263bcc..3f2cd38 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -128,14 +128,14 @@ struct bfd_link_hash_entry
       struct
 	{
 	  /* The linker needs to know three things about common
-             symbols: the size, the alignment, and the section in
-             which the symbol should be placed.  We store the size
-             here, and we allocate a small structure to hold the
-             section and the alignment.  The alignment is stored as a
-             power of two.  We don't store all the information
-             directly because we don't want to increase the size of
-             the union; this structure is a major space user in the
-             linker.  */
+	     symbols: the size, the alignment, and the section in
+	     which the symbol should be placed.  We store the size
+	     here, and we allocate a small structure to hold the
+	     section and the alignment.  The alignment is stored as a
+	     power of two.  We don't store all the information
+	     directly because we don't want to increase the size of
+	     the union; this structure is a major space user in the
+	     linker.  */
 	  bfd_size_type size;	/* Common symbol size.  */
 	  struct bfd_link_hash_common_entry
 	    {
@@ -167,25 +167,25 @@ struct bfd_link_hash_table
   enum bfd_link_hash_table_type type;
 };
 
-/* Look up an entry in a link hash table.  If FOLLOW is true, this
+/* Look up an entry in a link hash table.  If FOLLOW is TRUE, this
    follows bfd_link_hash_indirect and bfd_link_hash_warning links to
    the real symbol.  */
 extern struct bfd_link_hash_entry *bfd_link_hash_lookup
-  PARAMS ((struct bfd_link_hash_table *, const char *, boolean create,
-	   boolean copy, boolean follow));
+  PARAMS ((struct bfd_link_hash_table *, const char *, bfd_boolean create,
+	   bfd_boolean copy, bfd_boolean follow));
 
 /* Look up an entry in the main linker hash table if the symbol might
    be wrapped.  This should only be used for references to an
    undefined symbol, not for definitions of a symbol.  */
 
 extern struct bfd_link_hash_entry *bfd_wrapped_link_hash_lookup
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean, boolean,
-	   boolean));
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, bfd_boolean,
+	   bfd_boolean, bfd_boolean));
 
 /* Traverse a link hash table.  */
 extern void bfd_link_hash_traverse
   PARAMS ((struct bfd_link_hash_table *,
-	   boolean (*) (struct bfd_link_hash_entry *, PTR),
+	   bfd_boolean (*) (struct bfd_link_hash_entry *, PTR),
 	   PTR));
 
 /* Add an entry to the undefs list.  */
@@ -206,46 +206,46 @@ struct bfd_link_info
   /* Function callbacks.  */
   const struct bfd_link_callbacks *callbacks;
 
-  /* true if BFD should generate a relocateable object file.  */
-  boolean relocateable;
+  /* TRUE if BFD should generate a relocateable object file.  */
+  bfd_boolean relocateable;
 
-  /* true if BFD should generate relocation information in the final
+  /* TRUE if BFD should generate relocation information in the final
      executable.  */
-  boolean emitrelocations;
+  bfd_boolean emitrelocations;
 
-  /* true if BFD should generate a "task linked" object file,
+  /* TRUE if BFD should generate a "task linked" object file,
      similar to relocatable but also with globals converted to
      statics.  */
-  boolean task_link;
+  bfd_boolean task_link;
 
-  /* true if BFD should generate a shared object.  */
-  boolean shared;
+  /* TRUE if BFD should generate a shared object.  */
+  bfd_boolean shared;
 
-  /* true if BFD should pre-bind symbols in a shared object.  */
-  boolean symbolic;
+  /* TRUE if BFD should pre-bind symbols in a shared object.  */
+  bfd_boolean symbolic;
 
-  /* true if BFD should export all symbols in the dynamic symbol table
+  /* TRUE if BFD should export all symbols in the dynamic symbol table
      of an executable, rather than only those used.  */
-  boolean export_dynamic;
+  bfd_boolean export_dynamic;
 
-  /* true if shared objects should be linked directly, not shared.  */
-  boolean static_link;
+  /* TRUE if shared objects should be linked directly, not shared.  */
+  bfd_boolean static_link;
 
-  /* true if the output file should be in a traditional format.  This
+  /* TRUE if the output file should be in a traditional format.  This
      is equivalent to the setting of the BFD_TRADITIONAL_FORMAT flag
      on the output file, but may be checked when reading the input
      files.  */
-  boolean traditional_format;
+  bfd_boolean traditional_format;
 
-  /* true if we want to produced optimized output files.  This might
+  /* TRUE if we want to produced optimized output files.  This might
      need much more time and therefore must be explicitly selected.  */
-  boolean optimize;
+  bfd_boolean optimize;
 
-  /* true if BFD should generate errors for undefined symbols
+  /* TRUE if BFD should generate errors for undefined symbols
      even if generating a shared object.  */
-  boolean no_undefined;
+  bfd_boolean no_undefined;
 
-  /* true if BFD should allow undefined symbols in shared objects even
+  /* TRUE if BFD should allow undefined symbols in shared objects even
      when no_undefined is set to disallow undefined symbols.  The net
      result will be that undefined symbols in regular objects will
      still trigger an error, but undefined symbols in shared objects
@@ -257,13 +257,13 @@ struct bfd_link_info
      appropriate for the current architecture.  I.E. dynamically
      select an appropriate memset function.  Apparently it is also
      normal for HPPA shared libraries to have undefined symbols.  */
-  boolean allow_shlib_undefined;
+  bfd_boolean allow_shlib_undefined;
 
-  /* true if ok to have multiple definition.  */
-  boolean allow_multiple_definition;
+  /* TRUE if ok to have multiple definition.  */
+  bfd_boolean allow_multiple_definition;
 
-  /* true if ok to have version with no definition.  */
-  boolean allow_undefined_version;
+  /* TRUE if ok to have version with no definition.  */
+  bfd_boolean allow_undefined_version;
 
   /* Which symbols to strip.  */
   enum bfd_link_strip strip;
@@ -271,9 +271,9 @@ struct bfd_link_info
   /* Which local symbols to discard.  */
   enum bfd_link_discard discard;
 
-  /* true if symbols should be retained in memory, false if they
+  /* TRUE if symbols should be retained in memory, FALSE if they
      should be freed and reread.  */
-  boolean keep_memory;
+  bfd_boolean keep_memory;
 
   /* The list of input BFD's involved in the link.  These are chained
      together via the link_next field.  */
@@ -297,12 +297,12 @@ struct bfd_link_info
      strip_some.  */
   struct bfd_hash_table *keep_hash;
 
-  /* true if every symbol should be reported back via the notice
+  /* TRUE if every symbol should be reported back via the notice
      callback.  */
-  boolean notice_all;
+  bfd_boolean notice_all;
 
   /* Hash table of symbols to report back via the notice callback.  If
-     this is NULL, and notice_all is false, then no symbols are
+     this is NULL, and notice_all is FALSE, then no symbols are
      reported back.  */
   struct bfd_hash_table *notice_hash;
 
@@ -326,8 +326,8 @@ struct bfd_link_info
      unloaded.  */
   const char *fini_function;
 
-  /* true if the new ELF dynamic tags are enabled. */ 
-  boolean new_dtags;
+  /* TRUE if the new ELF dynamic tags are enabled. */
+  bfd_boolean new_dtags;
 
   /* May be used to set DT_FLAGS for ELF. */
   bfd_vma flags;
@@ -335,7 +335,7 @@ struct bfd_link_info
   /* May be used to set DT_FLAGS_1 for ELF. */
   bfd_vma flags_1;
 
-  /* Non-zero if auto-import thunks for DATA items in pei386 DLLs 
+  /* Non-zero if auto-import thunks for DATA items in pei386 DLLs
      should be generated/linked against.  Set to 1 if this feature
      is explicitly requested by the user, -1 if enabled by default.  */
   int pei386_auto_import;
@@ -345,17 +345,17 @@ struct bfd_link_info
      is explicitly requested by the user, -1 if enabled by default.  */
   int pei386_runtime_pseudo_reloc;
 
-  /* True if non-PLT relocs should be merged into one reloc section
+  /* TRUE if non-PLT relocs should be merged into one reloc section
      and sorted so that relocs against the same symbol come together.  */
-  boolean combreloc;
+  bfd_boolean combreloc;
 
-  /* True if executable should not contain copy relocs.
+  /* TRUE if executable should not contain copy relocs.
      Setting this true may result in a non-sharable text segment.  */
-  boolean nocopyreloc;
+  bfd_boolean nocopyreloc;
 
-  /* True if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
+  /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
      should be created.  */
-  boolean eh_frame_hdr;
+  bfd_boolean eh_frame_hdr;
 
   /* How many spare .dynamic DT_NULL entries should be added?  */
   unsigned int spare_dynamic_tags;
@@ -368,7 +368,7 @@ struct bfd_link_info
 /* This structures holds a set of callback functions.  These are
    called by the BFD linker routines.  The first argument to each
    callback function is the bfd_link_info structure being used.  Each
-   function returns a boolean value.  If the function returns false,
+   function returns a boolean value.  If the function returns FALSE,
    then the BFD function which called it will return with a failure
    indication.  */
 
@@ -378,23 +378,18 @@ struct bfd_link_callbacks
      archive.  ABFD is the archive element being added.  NAME is the
      name of the symbol which caused the archive element to be pulled
      in.  */
-  boolean (*add_archive_element) PARAMS ((struct bfd_link_info *,
-					  bfd *abfd,
-					  const char *name));
+  bfd_boolean (*add_archive_element)
+    PARAMS ((struct bfd_link_info *, bfd *abfd, const char *name));
   /* A function which is called when a symbol is found with multiple
      definitions.  NAME is the symbol which is defined multiple times.
      OBFD is the old BFD, OSEC is the old section, OVAL is the old
      value, NBFD is the new BFD, NSEC is the new section, and NVAL is
      the new value.  OBFD may be NULL.  OSEC and NSEC may be
      bfd_com_section or bfd_ind_section.  */
-  boolean (*multiple_definition) PARAMS ((struct bfd_link_info *,
-					  const char *name,
-					  bfd *obfd,
-					  asection *osec,
-					  bfd_vma oval,
-					  bfd *nbfd,
-					  asection *nsec,
-					  bfd_vma nval));
+  bfd_boolean (*multiple_definition)
+    PARAMS ((struct bfd_link_info *, const char *name,
+	     bfd *obfd, asection *osec, bfd_vma oval,
+	     bfd *nbfd, asection *nsec, bfd_vma nval));
   /* A function which is called when a common symbol is defined
      multiple times.  NAME is the symbol appearing multiple times.
      OBFD is the BFD of the existing symbol; it may be NULL if this is
@@ -406,34 +401,29 @@ struct bfd_link_callbacks
      symbol, one of bfd_link_hash_defined, bfd_link_hash_common, or
      bfd_link_hash_indirect.  If NTYPE is bfd_link_hash_common, NSIZE
      is the size of the new symbol.  */
-  boolean (*multiple_common) PARAMS ((struct bfd_link_info *,
-				      const char *name,
-				      bfd *obfd,
-				      enum bfd_link_hash_type otype,
-				      bfd_vma osize,
-				      bfd *nbfd,
-				      enum bfd_link_hash_type ntype,
-				      bfd_vma nsize));
+  bfd_boolean (*multiple_common)
+    PARAMS ((struct bfd_link_info *, const char *name,
+	     bfd *obfd, enum bfd_link_hash_type otype, bfd_vma osize,
+	     bfd *nbfd, enum bfd_link_hash_type ntype, bfd_vma nsize));
   /* A function which is called to add a symbol to a set.  ENTRY is
      the link hash table entry for the set itself (e.g.,
      __CTOR_LIST__).  RELOC is the relocation to use for an entry in
      the set when generating a relocateable file, and is also used to
      get the size of the entry when generating an executable file.
      ABFD, SEC and VALUE identify the value to add to the set.  */
-  boolean (*add_to_set) PARAMS ((struct bfd_link_info *,
-				 struct bfd_link_hash_entry *entry,
-				 bfd_reloc_code_real_type reloc,
-				 bfd *abfd, asection *sec, bfd_vma value));
+  bfd_boolean (*add_to_set)
+    PARAMS ((struct bfd_link_info *, struct bfd_link_hash_entry *entry,
+	     bfd_reloc_code_real_type reloc, bfd *abfd, asection *sec,
+	     bfd_vma value));
   /* A function which is called when the name of a g++ constructor or
      destructor is found.  This is only called by some object file
-     formats.  CONSTRUCTOR is true for a constructor, false for a
+     formats.  CONSTRUCTOR is TRUE for a constructor, FALSE for a
      destructor.  This will use BFD_RELOC_CTOR when generating a
      relocateable file.  NAME is the name of the symbol found.  ABFD,
      SECTION and VALUE are the value of the symbol.  */
-  boolean (*constructor) PARAMS ((struct bfd_link_info *,
-				  boolean constructor,
-				  const char *name, bfd *abfd, asection *sec,
-				  bfd_vma value));
+  bfd_boolean (*constructor)
+    PARAMS ((struct bfd_link_info *, bfd_boolean constructor,
+	     const char *name, bfd *abfd, asection *sec, bfd_vma value));
   /* A function which is called to issue a linker warning.  For
      example, this is called when there is a reference to a warning
      symbol.  WARNING is the warning to be issued.  SYMBOL is the name
@@ -441,20 +431,17 @@ struct bfd_link_callbacks
      there is none.  ABFD, SECTION and ADDRESS identify the location
      which trigerred the warning; either ABFD or SECTION or both may
      be NULL if the location is not known.  */
-  boolean (*warning) PARAMS ((struct bfd_link_info *,
-			      const char *warning, const char *symbol,
-			      bfd *abfd, asection *section,
-			      bfd_vma address));
+  bfd_boolean (*warning)
+    PARAMS ((struct bfd_link_info *, const char *warning, const char *symbol,
+	     bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a relocation is attempted against
      an undefined symbol.  NAME is the symbol which is undefined.
      ABFD, SECTION and ADDRESS identify the location from which the
      reference is made. FATAL indicates whether an undefined symbol is
      a fatal error or not. In some cases SECTION may be NULL.  */
-  boolean (*undefined_symbol) PARAMS ((struct bfd_link_info *,
-				       const char *name, bfd *abfd,
-				       asection *section,
-				       bfd_vma address,
-				       boolean fatal));
+  bfd_boolean (*undefined_symbol)
+    PARAMS ((struct bfd_link_info *, const char *name, bfd *abfd,
+	     asection *section, bfd_vma address, bfd_boolean fatal));
   /* A function which is called when a reloc overflow occurs.  NAME is
      the name of the symbol or section the reloc is against,
      RELOC_NAME is the name of the relocation, and ADDEND is any
@@ -462,11 +449,9 @@ struct bfd_link_callbacks
      location at which the overflow occurs; if this is the result of a
      bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
      ABFD will be NULL.  */
-  boolean (*reloc_overflow) PARAMS ((struct bfd_link_info *,
-				     const char *name,
-				     const char *reloc_name, bfd_vma addend,
-				     bfd *abfd, asection *section,
-				     bfd_vma address));
+  bfd_boolean (*reloc_overflow)
+    PARAMS ((struct bfd_link_info *, const char *name, const char *reloc_name,
+	     bfd_vma addend, bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a dangerous reloc is performed.
      The canonical example is an a29k IHCONST reloc which does not
      follow an IHIHALF reloc.  MESSAGE is an appropriate message.
@@ -474,26 +459,25 @@ struct bfd_link_callbacks
      problem occurred; if this is the result of a
      bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
      ABFD will be NULL.  */
-  boolean (*reloc_dangerous) PARAMS ((struct bfd_link_info *,
-				      const char *message,
-				      bfd *abfd, asection *section,
-				      bfd_vma address));
+  bfd_boolean (*reloc_dangerous)
+    PARAMS ((struct bfd_link_info *, const char *message,
+	     bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a reloc is found to be attached
      to a symbol which is not being written out.  NAME is the name of
      the symbol.  ABFD, SECTION and ADDRESS identify the location of
      the reloc; if this is the result of a
      bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
      ABFD will be NULL.  */
-  boolean (*unattached_reloc) PARAMS ((struct bfd_link_info *,
-				       const char *name,
-				       bfd *abfd, asection *section,
-				       bfd_vma address));
+  bfd_boolean (*unattached_reloc)
+    PARAMS ((struct bfd_link_info *, const char *name,
+	     bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a symbol in notice_hash is
      defined or referenced.  NAME is the symbol.  ABFD, SECTION and
      ADDRESS are the value of the symbol.  If SECTION is
      bfd_und_section, this is a reference.  */
-  boolean (*notice) PARAMS ((struct bfd_link_info *, const char *name,
-			     bfd *abfd, asection *section, bfd_vma address));
+  bfd_boolean (*notice)
+    PARAMS ((struct bfd_link_info *, const char *name,
+	     bfd *abfd, asection *section, bfd_vma address));
 };
 
 /* The linker builds link_order structures which tell the code how to
@@ -513,20 +497,20 @@ enum bfd_link_order_type
 /* This is the link_order structure itself.  These form a chain
    attached to the section whose contents they are describing.  */
 
-struct bfd_link_order 
+struct bfd_link_order
 {
   /* Next link_order in chain.  */
   struct bfd_link_order *next;
   /* Type of link_order.  */
   enum bfd_link_order_type type;
   /* Offset within output section.  */
-  bfd_vma offset;  
+  bfd_vma offset;
   /* Size within output section.  */
   bfd_size_type size;
   /* Type specific information.  */
-  union 
+  union
     {
-      struct 
+      struct
 	{
 	  /* Section to include.  If this is used, then
 	     section->output_section must be the section the
@@ -609,7 +593,7 @@ struct bfd_elf_version_expr
   /* Regular expression.  */
   const char *pattern;
   /* Matching function.  */
-  int (*match) PARAMS((struct bfd_elf_version_expr *, const char *));
+  int (*match) PARAMS ((struct bfd_elf_version_expr *, const char *));
   /* Defined by ".symver".  */
   unsigned int symver: 1;
   /* Defined by version script.  */
diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index 23b0627..b2eec4c 100644
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* ecoff.h: Replace boolean with bfd_boolean.
+	* xcoff.h: Likewise.
+
 2002-03-18  Tom Rix  <trix@redhat.com>
 
 	* rs6k64.h: Add U64_TOCMAGIC, AIX 5 64 bit magic number.
diff --git a/include/coff/ecoff.h b/include/coff/ecoff.h
index 076fdf5..00d2f24 100644
--- a/include/coff/ecoff.h
+++ b/include/coff/ecoff.h
@@ -2,22 +2,22 @@
    This does not include symbol information, found in sym.h and
    symconst.h.
 
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-   
+
 #ifndef ECOFF_H
 #define ECOFF_H
 
@@ -430,8 +430,8 @@ struct ecoff_debug_swap
   /* Function to read symbol data and set up pointers in
      ecoff_debug_info structure.  The section argument is used for
      ELF, not straight ECOFF.  */
-  boolean (*read_debug_info) PARAMS ((bfd *, asection *,
-				      struct ecoff_debug_info *));
+  bfd_boolean (*read_debug_info)
+    PARAMS ((bfd *, asection *, struct ecoff_debug_info *));
 };
 
 #endif /* ! defined (ECOFF_H) */
diff --git a/include/coff/xcoff.h b/include/coff/xcoff.h
index 0bb9d6c..b27cece 100644
--- a/include/coff/xcoff.h
+++ b/include/coff/xcoff.h
@@ -1,6 +1,6 @@
 /* Internal format of XCOFF object file data structures for BFD.
 
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>, Cygnus Support.
 
@@ -366,10 +366,10 @@ struct xcoff_link_hash_table
   unsigned long file_align;
 
   /* Whether the .text section must be read-only.  */
-  boolean textro;
+  bfd_boolean textro;
 
   /* Whether garbage collection was done.  */
-  boolean gc;
+  bfd_boolean gc;
 
   /* A linked list of symbols for which we have size information.  */
   struct xcoff_link_size_list
@@ -391,7 +391,7 @@ struct xcoff_link_hash_table
 struct xcoff_loader_info
 {
   /* Set if a problem occurred.  */
-  boolean failed;
+  bfd_boolean failed;
 
   /* Output BFD.  */
   bfd *output_bfd;
@@ -400,7 +400,7 @@ struct xcoff_loader_info
   struct bfd_link_info *info;
 
   /* Whether all defined symbols should be exported.  */
-  boolean export_defineds;
+  bfd_boolean export_defineds;
 
   /* Number of ldsym structures.  */
   size_t ldsym_count;
@@ -604,7 +604,7 @@ struct xcoff_ar_hdr_big
 /* We often have to distinguish between the old and big file format.
    Make it a bit cleaner.  We can use `xcoff_ardata' here because the
    `hdr' member has the same size and position in both formats.  
-   <bigaf> is the default format, return true even when xcoff_ardata is 
+   <bigaf> is the default format, return TRUE even when xcoff_ardata is 
    NULL. */
 #ifndef SMALL_ARCHIVE
 /* Creates big archives by default */
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index f8bf08a..f3e7e62 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* mmix.h: Replace boolean with bfd_boolean.
+	* sh.h: Likewise.
+
 2002-11-28  Alan Modra  <amodra@bigpond.net.au>
 
 	* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
diff --git a/include/elf/mmix.h b/include/elf/mmix.h
index e3be26b..98536e2 100644
--- a/include/elf/mmix.h
+++ b/include/elf/mmix.h
@@ -1,5 +1,5 @@
 /* MMIX support for BFD.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -157,11 +157,11 @@ END_RELOC_NUMBERS (R_MMIX_max)
 #define MMO_SEC_DEBUGGING 0x10000
 
 #ifdef BFD_ARCH_SIZE
-extern boolean _bfd_mmix_prepare_linker_allocated_gregs
+extern bfd_boolean _bfd_mmix_prepare_linker_allocated_gregs
  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_mmix_finalize_linker_allocated_gregs
+extern bfd_boolean _bfd_mmix_finalize_linker_allocated_gregs
  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_mmix_check_all_relocs
+extern bfd_boolean _bfd_mmix_check_all_relocs
  PARAMS ((bfd *, struct bfd_link_info *));
 #endif
 
diff --git a/include/elf/sh.h b/include/elf/sh.h
index ef964d6..68a2c54 100644
--- a/include/elf/sh.h
+++ b/include/elf/sh.h
@@ -106,7 +106,7 @@ extern enum sh64_elf_cr_type sh64_get_contents_type
 
 /* Simpler interface.
    FIXME: This seems redundant now that we export the interface above.  */
-extern boolean sh64_address_is_shmedia PARAMS ((asection *, bfd_vma));
+extern bfd_boolean sh64_address_is_shmedia PARAMS ((asection *, bfd_vma));
 
 extern int _bfd_sh64_crange_qsort_cmpb PARAMS ((const void *, const void *));
 extern int _bfd_sh64_crange_qsort_cmpl PARAMS ((const void *, const void *));