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

comparisons of bfd_boolean vars with TRUE/FALSE.  Formatting.

19 files changed, 115 insertions, 101 deletions

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 16bdd1c312e..40eb8311862 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* basic_blocks.c, basic_blocks.h, cg_arcs.c, cg_dfn.c, cg_print.c,
+	corefile.c, gmon_io.c, gprof.c, gprof.h, hist.c, mips.c, source.c,
+	source.h, sym_ids.c, sym_ids.h, symtab.h, tahoe.c, vax.c: Replace
+	boolean with bfd_boolean, true with TRUE, false with FALSE.
+	Formatting.
+
 2002-11-12  Nick Clifton  <nickc@redhat.com>
 
 	* configure.in (ALL_LINGUAS): Add da.
diff --git a/gprof/basic_blocks.c b/gprof/basic_blocks.c
index 74f29a0eb19..a37ca0b2441 100644
--- a/gprof/basic_blocks.c
+++ b/gprof/basic_blocks.c
@@ -38,7 +38,7 @@ static void fskip_string PARAMS ((FILE *));
 static void annotate_with_count PARAMS ((char *, unsigned int, int, PTR));
 
 /* Default option values:  */
-boolean bb_annotate_all_lines = false;
+bfd_boolean bb_annotate_all_lines = FALSE;
 unsigned long bb_min_calls = 1;
 int bb_table_length = 10;
 
@@ -150,8 +150,8 @@ bb_read_rec (ifp, filename)
 	     care about anymore.  */
 	  if ((fread (&ncalls, sizeof (ncalls), 1, ifp) != 1)
 	      || (fread (&addr, sizeof (addr), 1, ifp) != 1)
-	      || (fskip_string (ifp), false)
-	      || (fskip_string (ifp), false)
+	      || (fskip_string (ifp), FALSE)
+	      || (fskip_string (ifp), FALSE)
 	      || (fread (&line_num, sizeof (line_num), 1, ifp) != 1))
 	    {
 	      perror (filename);
@@ -193,11 +193,11 @@ bb_read_rec (ifp, filename)
 	}
       else
 	{
-	  static boolean user_warned = false;
+	  static bfd_boolean user_warned = FALSE;
 
 	  if (!user_warned)
 	    {
-	      user_warned = true;
+	      user_warned = TRUE;
 	      fprintf (stderr,
   _("%s: warning: ignoring basic-block exec counts (use -l or --line)\n"),
 		       whoami);
@@ -262,7 +262,7 @@ print_exec_counts ()
   unsigned int i, j, len;
 
   if (first_output)
-    first_output = false;
+    first_output = FALSE;
   else
     printf ("\f\n");
 
diff --git a/gprof/basic_blocks.h b/gprof/basic_blocks.h
index 70a65bb764a..4308a792595 100644
--- a/gprof/basic_blocks.h
+++ b/gprof/basic_blocks.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define basic_blocks_h
 
 /* Options:  */
-extern boolean bb_annotate_all_lines;	/* Force annotation of all lines?  */
+extern bfd_boolean bb_annotate_all_lines; /* Force annotation of all lines?  */
 extern int bb_table_length;		/* Length of most-used bb table.  */
 extern unsigned long bb_min_calls;	/* Minimum execution count.  */
 
diff --git a/gprof/cg_arcs.c b/gprof/cg_arcs.c
index 822184eee0d..cea21cf5053 100644
--- a/gprof/cg_arcs.c
+++ b/gprof/cg_arcs.c
@@ -316,7 +316,7 @@ cycle_link ()
       ++num;
       ++cyc;
       sym_init (cyc);
-      cyc->cg.print_flag = true;	/* should this be printed? */
+      cyc->cg.print_flag = TRUE;	/* should this be printed? */
       cyc->cg.top_order = DFN_NAN;	/* graph call chain top-sort order */
       cyc->cg.cyc.num = num;	/* internal number of cycle on */
       cyc->cg.cyc.head = cyc;	/* pointer to head of cycle */
@@ -375,7 +375,7 @@ inherit_flags (child)
   if (child == head)
     {
       /* just a regular child, check its parents: */
-      child->cg.print_flag = false;
+      child->cg.print_flag = FALSE;
       child->cg.prop.fract = 0.0;
       for (arc = child->cg.parents; arc; arc = arc->next_parent)
 	{
@@ -403,7 +403,7 @@ inherit_flags (child)
        * Its a member of a cycle, look at all parents from outside
        * the cycle.
        */
-      head->cg.print_flag = false;
+      head->cg.print_flag = FALSE;
       head->cg.prop.fract = 0.0;
       for (member = head->cg.cyc.next; member; member = member->cg.cyc.next)
 	{
@@ -481,7 +481,7 @@ propagate_flags (symbols)
 	      || (syms[INCL_GRAPH].len == 0
 		  && !sym_lookup (&syms[EXCL_GRAPH], child->addr)))
 	    {
-	      child->cg.print_flag = true;
+	      child->cg.print_flag = TRUE;
 	    }
 	}
       else
@@ -494,7 +494,7 @@ propagate_flags (symbols)
 	  if (!sym_lookup (&syms[INCL_GRAPH], child->addr)
 	      && sym_lookup (&syms[EXCL_GRAPH], child->addr))
 	    {
-	      child->cg.print_flag = false;
+	      child->cg.print_flag = FALSE;
 	    }
 	}
       if (child->cg.prop.fract == 0.0)
@@ -632,7 +632,7 @@ cg_assemble ()
       parent->cg.prop.fract = 0.0;
       parent->cg.prop.self = 0.0;
       parent->cg.prop.child = 0.0;
-      parent->cg.print_flag = false;
+      parent->cg.print_flag = FALSE;
       parent->cg.top_order = DFN_NAN;
       parent->cg.cyc.num = 0;
       parent->cg.cyc.head = parent;
diff --git a/gprof/cg_dfn.c b/gprof/cg_dfn.c
index a4ec5216a95..5c8b5ec745e 100644
--- a/gprof/cg_dfn.c
+++ b/gprof/cg_dfn.c
@@ -44,8 +44,8 @@ typedef struct
   }
 DFN_Stack;
 
-static boolean is_numbered PARAMS ((Sym *));
-static boolean is_busy PARAMS ((Sym *));
+static bfd_boolean is_numbered PARAMS ((Sym *));
+static bfd_boolean is_busy PARAMS ((Sym *));
 static void find_cycle PARAMS ((Sym *));
 static void pre_visit PARAMS ((Sym *));
 static void post_visit PARAMS ((Sym *));
@@ -59,7 +59,7 @@ int dfn_counter = DFN_NAN;
 /*
  * Is CHILD already numbered?
  */
-static boolean
+static bfd_boolean
 is_numbered (child)
      Sym *child;
 {
@@ -70,15 +70,15 @@ is_numbered (child)
 /*
  * Is CHILD already busy?
  */
-static boolean
+static bfd_boolean
 is_busy (child)
      Sym *child;
 {
   if (child->cg.top_order == DFN_NAN)
     {
-      return false;
+      return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
 
diff --git a/gprof/cg_print.c b/gprof/cg_print.c
index 4aa445b48a8..21847027c1c 100644
--- a/gprof/cg_print.c
+++ b/gprof/cg_print.c
@@ -63,7 +63,7 @@ static void
 print_header ()
 {
   if (first_output)
-    first_output = false;
+    first_output = FALSE;
   else
     printf ("\f\n");
 
diff --git a/gprof/corefile.c b/gprof/corefile.c
index 74e78f5eec2..4b8fa134003 100644
--- a/gprof/corefile.c
+++ b/gprof/corefile.c
@@ -41,7 +41,7 @@ unsigned int symbol_map_count;
 
 static void read_function_mappings PARAMS ((const char *));
 static int core_sym_class PARAMS ((asymbol *));
-static boolean get_src_info
+static bfd_boolean get_src_info
   PARAMS ((bfd_vma, const char **, const char **, int *));
 
 extern void i386_find_call  PARAMS ((Sym *, bfd_vma, bfd_vma));
@@ -277,7 +277,7 @@ find_call (parent, p_lowpc, p_highpc)
 	       whoami, bfd_printable_name(core_bfd));
 
       /* Don't give the error more than once.  */
-      ignore_direct_calls = false;
+      ignore_direct_calls = FALSE;
     }
 }
 
@@ -370,7 +370,7 @@ core_sym_class (sym)
 
 /* Get whatever source info we can get regarding address ADDR.  */
 
-static boolean
+static bfd_boolean
 get_src_info (addr, filename, name, line_num)
      bfd_vma addr;
      const char **filename;
@@ -390,14 +390,14 @@ get_src_info (addr, filename, name, line_num)
       *filename = fname;
       *name = func_name;
       *line_num = l;
-      return true;
+      return TRUE;
     }
   else
     {
       DBG (AOUTDEBUG, printf ("[get_src_info] no info for 0x%lx (%s:%d,%s)\n",
 			      (long) addr, fname ? fname : "<unknown>", l,
 			      func_name ? func_name : "<unknown>"));
-      return false;
+      return FALSE;
     }
 }
 
@@ -536,11 +536,11 @@ core_create_function_syms (cbfd)
 	  }
       }
 
-      symtab.limit->is_func = true;
-      symtab.limit->is_bb_head = true;
+      symtab.limit->is_func = TRUE;
+      symtab.limit->is_bb_head = TRUE;
 
       if (class == 't')
-	symtab.limit->is_static = true;
+	symtab.limit->is_static = TRUE;
 
       /* Keep track of the minimum and maximum vma addresses used by all
 	 symbols.  When computing the max_vma, use the ending address of the
diff --git a/gprof/gmon_io.c b/gprof/gmon_io.c
index 58bd3edfce0..f821b0ca2ef 100644
--- a/gprof/gmon_io.c
+++ b/gprof/gmon_io.c
@@ -586,7 +586,7 @@ gmon_out_read (filename)
       printf (nbbs == 1 ?
 	      _("\t%d basic-block count record\n") :
 	      _("\t%d basic-block count records\n"), nbbs);
-      first_output = false;
+      first_output = FALSE;
     }
 }
 
diff --git a/gprof/gprof.c b/gprof/gprof.c
index b633f0e6a26..260dbebb4a7 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -58,19 +58,19 @@ long hz = HZ_WRONG;
 int debug_level = 0;
 int output_style = 0;
 int output_width = 80;
-boolean bsd_style_output = false;
-boolean demangle = true;
-boolean discard_underscores = true;
-boolean ignore_direct_calls = false;
-boolean ignore_static_funcs = false;
-boolean ignore_zeros = true;
-boolean line_granularity = false;
-boolean print_descriptions = true;
-boolean print_path = false;
-boolean ignore_non_functions = false;
+bfd_boolean bsd_style_output = FALSE;
+bfd_boolean demangle = TRUE;
+bfd_boolean discard_underscores = TRUE;
+bfd_boolean ignore_direct_calls = FALSE;
+bfd_boolean ignore_static_funcs = FALSE;
+bfd_boolean ignore_zeros = TRUE;
+bfd_boolean line_granularity = FALSE;
+bfd_boolean print_descriptions = TRUE;
+bfd_boolean print_path = FALSE;
+bfd_boolean ignore_non_functions = FALSE;
 File_Format file_format = FF_AUTO;
 
-boolean first_output = true;
+bfd_boolean first_output = TRUE;
 
 char copyright[] =
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
@@ -210,7 +210,7 @@ main (argc, argv)
       switch (ch)
 	{
 	case 'a':
-	  ignore_static_funcs = true;
+	  ignore_static_funcs = TRUE;
 	  break;
 	case 'A':
 	  if (optarg)
@@ -221,14 +221,14 @@ main (argc, argv)
 	  user_specified |= STYLE_ANNOTATED_SOURCE;
 	  break;
 	case 'b':
-	  print_descriptions = false;
+	  print_descriptions = FALSE;
 	  break;
 	case 'B':
 	  output_style |= STYLE_CALL_GRAPH;
 	  user_specified |= STYLE_CALL_GRAPH;
 	  break;
 	case 'c':
-	  ignore_direct_calls = true;
+	  ignore_direct_calls = TRUE;
 	  break;
 	case 'C':
 	  if (optarg)
@@ -254,7 +254,7 @@ main (argc, argv)
 #endif	/* DEBUG */
 	  break;
 	case 'D':
-	  ignore_non_functions = true;
+	  ignore_non_functions = TRUE;
 	  break;
 	case 'E':
 	  sym_id_add (optarg, EXCL_TIME);
@@ -297,10 +297,10 @@ main (argc, argv)
 	  sym_id_add (optarg, EXCL_ARCS);
 	  break;
 	case 'l':
-	  line_granularity = true;
+	  line_granularity = TRUE;
 	  break;
 	case 'L':
-	  print_path = true;
+	  print_path = TRUE;
 	  break;
 	case 'm':
 	  bb_min_calls = (unsigned long) strtoul (optarg, (char **) NULL, 10);
@@ -410,7 +410,7 @@ main (argc, argv)
 	    }
 	  break;
 	case 'T':
-	  bsd_style_output = true;
+	  bsd_style_output = TRUE;
 	  break;
 	case 'v':
 	  /* This output is intended to follow the GNU standards document.  */
@@ -427,13 +427,13 @@ This program is free software.  This program has absolutely no warranty.\n"));
 	    }
 	  break;
 	case 'x':
-	  bb_annotate_all_lines = true;
+	  bb_annotate_all_lines = TRUE;
 	  break;
 	case 'y':
-	  create_annotation_files = true;
+	  create_annotation_files = TRUE;
 	  break;
 	case 'z':
-	  ignore_zeros = false;
+	  ignore_zeros = FALSE;
 	  break;
 	case 'Z':
 	  if (optarg)
@@ -448,7 +448,7 @@ This program is free software.  This program has absolutely no warranty.\n"));
 	  user_specified |= STYLE_ANNOTATED_SOURCE;
 	  break;
 	case OPTION_DEMANGLE:
-	  demangle = true;
+	  demangle = TRUE;
 	  if (optarg != NULL)
 	    {
 	      enum demangling_styles style;
@@ -466,7 +466,7 @@ This program is free software.  This program has absolutely no warranty.\n"));
 	   }
 	  break;
 	case OPTION_NO_DEMANGLE:
-	  demangle = false;
+	  demangle = FALSE;
 	  break;
 	default:
 	  usage (stderr, 1);
diff --git a/gprof/gprof.h b/gprof/gprof.h
index 2e097d966bf..b0679ff61d1 100644
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -119,20 +119,20 @@ extern long hz;			/* ticks per second */
 extern int debug_level;			/* debug level */
 extern int output_style;
 extern int output_width;		/* controls column width in index */
-extern boolean bsd_style_output;	/* as opposed to FSF style output */
-extern boolean demangle;		/* demangle symbol names? */
-extern boolean discard_underscores;	/* discard leading underscores? */
-extern boolean ignore_direct_calls;	/* don't count direct calls */
-extern boolean ignore_static_funcs;	/* suppress static functions */
-extern boolean ignore_zeros;		/* ignore unused symbols/files */
-extern boolean line_granularity;	/* function or line granularity? */
-extern boolean print_descriptions;	/* output profile description */
-extern boolean print_path;		/* print path or just filename? */
-extern boolean ignore_non_functions;	/* Ignore non-function symbols.  */
+extern bfd_boolean bsd_style_output;	/* as opposed to FSF style output */
+extern bfd_boolean demangle;		/* demangle symbol names? */
+extern bfd_boolean discard_underscores;	/* discard leading underscores? */
+extern bfd_boolean ignore_direct_calls;	/* don't count direct calls */
+extern bfd_boolean ignore_static_funcs;	/* suppress static functions */
+extern bfd_boolean ignore_zeros;	/* ignore unused symbols/files */
+extern bfd_boolean line_granularity;	/* function or line granularity? */
+extern bfd_boolean print_descriptions;	/* output profile description */
+extern bfd_boolean print_path;		/* print path or just filename? */
+extern bfd_boolean ignore_non_functions; /* Ignore non-function symbols.  */
 
 extern File_Format file_format;		/* requested file format */
 
-extern boolean first_output;		/* no output so far? */
+extern bfd_boolean first_output;	/* no output so far? */
 
 extern void done PARAMS ((int status)) ATTRIBUTE_NORETURN;
 
diff --git a/gprof/hist.c b/gprof/hist.c
index 08aae2ee901..bfa34eebf08 100644
--- a/gprof/hist.c
+++ b/gprof/hist.c
@@ -468,7 +468,7 @@ hist_print ()
   bfd_vma addr;
 
   if (first_output)
-    first_output = false;
+    first_output = FALSE;
   else
     printf ("\f\n");
 
diff --git a/gprof/mips.c b/gprof/mips.c
index 1c5fd33f07e..ef7feae55c1 100644
--- a/gprof/mips.c
+++ b/gprof/mips.c
@@ -48,11 +48,11 @@ mips_find_call (parent, p_lowpc, p_highpc)
   unsigned int op;
   int offset;
   Sym *child;
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
 
   if (!inited)
     {
-      inited = true;
+      inited = TRUE;
       sym_init (&indirect_child);
       indirect_child.name = _("<indirect child>");
       indirect_child.cg.prop.fract = 1.0;
diff --git a/gprof/source.c b/gprof/source.c
index 496373e752f..4074b2ba0cd 100644
--- a/gprof/source.c
+++ b/gprof/source.c
@@ -28,7 +28,7 @@
 #define EXT_ANNO "-ann"		/* Postfix of annotated files.  */
 
 /* Default option values.  */
-boolean create_annotation_files = false;
+bfd_boolean create_annotation_files = FALSE;
 
 Search_List src_search_list = {0, 0};
 Source_File *first_src_file = 0;
@@ -97,9 +97,9 @@ annotate_source (sf, max_width, annote, arg)
      void (*annote) PARAMS ((char *, unsigned int, int, void *));
      void *arg;
 {
-  static boolean first_file = true;
+  static bfd_boolean first_file = TRUE;
   int i, line_num, nread;
-  boolean new_line;
+  bfd_boolean new_line;
   char buf[8192];
   char fname[PATH_MAX];
   char *annotation, *name_only;
@@ -114,7 +114,7 @@ annotate_source (sf, max_width, annote, arg)
     sle = 0;			/* Don't use search list for absolute paths.  */
 
   name_only = 0;
-  while (true)
+  while (TRUE)
     {
       DBG (SRCDEBUG, printf ("[annotate_source]: looking for %s, trying %s\n",
 			     sf->name, fname));
@@ -229,12 +229,12 @@ annotate_source (sf, max_width, annote, arg)
   if (ofp == stdout)
     {
       if (first_file)
-	first_file = false;
+	first_file = FALSE;
       else
 	fputc ('\n', ofp);
 
       if (first_output)
-	first_output = false;
+	first_output = FALSE;
       else
 	fprintf (ofp, "\f\n");
 
@@ -243,7 +243,7 @@ annotate_source (sf, max_width, annote, arg)
 
   annotation = xmalloc (max_width + 1);
   line_num = 1;
-  new_line = true;
+  new_line = TRUE;
 
   while ((nread = fread (buf, 1, sizeof (buf), ifp)) > 0)
     {
@@ -254,7 +254,7 @@ annotate_source (sf, max_width, annote, arg)
 	      (*annote) (annotation, max_width, line_num, arg);
 	      fputs (annotation, ofp);
 	      ++line_num;
-	      new_line = false;
+	      new_line = FALSE;
 	    }
 
 	  new_line = (buf[i] == '\n');
diff --git a/gprof/source.h b/gprof/source.h
index 6cc23ab8b4f..53eac5eca73 100644
--- a/gprof/source.h
+++ b/gprof/source.h
@@ -33,7 +33,9 @@ typedef struct source_file
 Source_File;
 
 /* Options.  */
-extern boolean create_annotation_files;	/* Create annotated output files?  */
+
+/* Create annotated output files?  */
+extern bfd_boolean create_annotation_files;
 
 /* List of directories to search for source files.  */
 extern Search_List src_search_list;
diff --git a/gprof/sym_ids.c b/gprof/sym_ids.c
index 66ee0f6fcb4..f75088a30ea 100644
--- a/gprof/sym_ids.c
+++ b/gprof/sym_ids.c
@@ -33,7 +33,7 @@ struct sym_id
     struct sym_id *next;
     char *spec;			/* Parsing modifies this.  */
     Table_Id which_table;
-    boolean has_right;
+    bfd_boolean has_right;
 
     struct match
       {
@@ -46,10 +46,14 @@ struct sym_id
   }
  *id_list;
 
-static void parse_spec PARAMS ((char *, Sym *));
-static void parse_id PARAMS ((struct sym_id *));
-static boolean match PARAMS ((Sym *, Sym *));
-static void extend_match PARAMS ((struct match *, Sym *, Sym_Table *, boolean));
+static void parse_spec
+  PARAMS ((char *, Sym *));
+static void parse_id
+  PARAMS ((struct sym_id *));
+static bfd_boolean match
+  PARAMS ((Sym *, Sym *));
+static void extend_match
+  PARAMS ((struct match *, Sym *, Sym_Table *, bfd_boolean));
 
 
 Sym_Table syms[NUM_TABLES];
@@ -179,7 +183,7 @@ parse_id (id)
     {
       parse_spec (slash + 1, &id->right.sym);
       *slash = '\0';
-      id->has_right = true;
+      id->has_right = TRUE;
     }
   parse_spec (id->spec, &id->left.sym);
 
@@ -216,17 +220,17 @@ parse_id (id)
 
 /* Return TRUE iff PATTERN matches SYM.  */
 
-static boolean
+static bfd_boolean
 match (pattern, sym)
      Sym *pattern;
      Sym *sym;
 {
-  return (pattern->file ? pattern->file == sym->file : true)
-    && (pattern->line_num ? pattern->line_num == sym->line_num : true)
+  return (pattern->file ? pattern->file == sym->file : TRUE)
+    && (pattern->line_num ? pattern->line_num == sym->line_num : TRUE)
     && (pattern->name
 	? strcmp (pattern->name,
 		  sym->name+(discard_underscores && sym->name[0] == '_')) == 0
-	: true);
+	: TRUE);
 }
 
 
@@ -235,7 +239,7 @@ extend_match (m, sym, tab, second_pass)
      struct match *m;
      Sym *sym;
      Sym_Table *tab;
-     boolean second_pass;
+     bfd_boolean second_pass;
 {
   if (m->prev_match != sym - 1)
     {
@@ -286,10 +290,10 @@ sym_id_parse ()
       for (id = id_list; id; id = id->next)
 	{
 	  if (match (&id->left.sym, sym))
-	    extend_match (&id->left, sym, &syms[id->which_table], false);
+	    extend_match (&id->left, sym, &syms[id->which_table], FALSE);
 
 	  if (id->has_right && match (&id->right.sym, sym))
-	    extend_match (&id->right, sym, &right_ids, false);
+	    extend_match (&id->right, sym, &right_ids, FALSE);
 	}
     }
 
@@ -317,10 +321,10 @@ sym_id_parse ()
       for (id = id_list; id; id = id->next)
 	{
 	  if (match (&id->left.sym, sym))
-	    extend_match (&id->left, sym, &syms[id->which_table], true);
+	    extend_match (&id->left, sym, &syms[id->which_table], TRUE);
 
 	  if (id->has_right && match (&id->right.sym, sym))
-	    extend_match (&id->right, sym, &right_ids, true);
+	    extend_match (&id->right, sym, &right_ids, TRUE);
 	}
     }
 
@@ -368,7 +372,7 @@ sym_id_parse ()
    time requesting -k a/b.  Fortunately, those symbol tables don't get
    very big (the user has to type them!), so a linear search is probably
    tolerable.  */
-boolean
+bfd_boolean
 sym_id_arc_is_present (sym_tab, from, to)
      Sym_Table *sym_tab;
      Sym *from;
@@ -380,8 +384,8 @@ sym_id_arc_is_present (sym_tab, from, to)
     {
       if (from->addr >= sym->addr && from->addr <= sym->end_addr
 	  && arc_lookup (sym, to))
-	return true;
+	return TRUE;
     }
 
-  return false;
+  return FALSE;
 }
diff --git a/gprof/sym_ids.h b/gprof/sym_ids.h
index 49565eb50e7..634ac969de9 100644
--- a/gprof/sym_ids.h
+++ b/gprof/sym_ids.h
@@ -35,8 +35,8 @@ Table_Id;
 
 extern Sym_Table syms[NUM_TABLES];
 
-extern void sym_id_add               PARAMS ((const char *, Table_Id));
-extern void sym_id_parse             PARAMS ((void));
-extern boolean sym_id_arc_is_present PARAMS ((Sym_Table *, Sym *, Sym *));
+extern void sym_id_add PARAMS ((const char *, Table_Id));
+extern void sym_id_parse PARAMS ((void));
+extern bfd_boolean sym_id_arc_is_present PARAMS ((Sym_Table *, Sym *, Sym *));
 
 #endif /* sym_ids_h */
diff --git a/gprof/symtab.h b/gprof/symtab.h
index edeb1b313d2..4ff507d1876 100644
--- a/gprof/symtab.h
+++ b/gprof/symtab.h
@@ -77,7 +77,7 @@ typedef struct sym
 	double child_time;	/* Cumulative ticks in children.  */
 	int index;		/* Index in the graph list.  */
 	int top_order;		/* Graph call chain top-sort order.  */
-	boolean print_flag;	/* Should this be printed?  */
+	bfd_boolean print_flag;	/* Should this be printed?  */
 	struct
 	  {
 	    double fract;	/* What % of time propagates.  */
diff --git a/gprof/tahoe.c b/gprof/tahoe.c
index fa88ff07309..1e7da7df0ac 100644
--- a/gprof/tahoe.c
+++ b/gprof/tahoe.c
@@ -231,11 +231,11 @@ tahoe_find_call (parent, p_lowpc, p_highpc)
   tahoe_operandenum mode;
   tahoe_operandenum firstmode;
   bfd_vma pc, destpc;
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
 
   if (!inited)
     {
-      inited = true;
+      inited = TRUE;
       sym_init (&indirectchild);
       indirectchild.cg.prop.fract = 1.0;
       indirectchild.cg.cyc.head = &indirectchild;
diff --git a/gprof/vax.c b/gprof/vax.c
index 4e5e4ff6171..56f5f4f0ceb 100644
--- a/gprof/vax.c
+++ b/gprof/vax.c
@@ -242,11 +242,11 @@ vax_find_call (parent, p_lowpc, p_highpc)
   operandenum mode;
   operandenum firstmode;
   bfd_vma pc, destpc;
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
 
   if (!inited)
     {
-      inited = true;
+      inited = TRUE;
       sym_init (&indirectchild);
       indirectchild.cg.prop.fract = 1.0;
       indirectchild.cg.cyc.head = &indirectchild;