* aout-adobe.c: Don't compare against "true" or "false.

[deliverable/binutils-gdb.git] / gprof / gprof.h

diff --git a/gprof/gprof.h b/gprof/gprof.h
index 43e767567d5f22368e5ee2fc1014ee30faa144ef..911c5be3d6d5f0ec9c3076216b075d7f41c6d3fc 100644 (file)
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -21,10 +21,9 @@
 #ifndef gprof_h
 #define gprof_h
 
-#include "ansidecl.h"
-
 /* Include the BFD sysdep.h file.  */
 #include "sysdep.h"
+#include "bfd.h"
 
 /* Undefine the BFD PACKAGE and VERSION macros before including the
    gprof config.h file.  */
@@ -56,23 +55,13 @@
 #endif
 
 #ifdef ENABLE_NLS
-/* Undefine BFD's `_' macro; we have our own definition.  */
-#undef _
+/* Undefine BFD's `_' macro - it uses dgetext() and we want to use gettext().  */
+#undef  _
 #define _(String) gettext (String)
 #endif
 
 #include "bin-bugs.h"
 
-/*
- * These may already be defined on some systems.  We could probably
- * just use the BFD versions of these, since BFD has already dealt
- * with this problem.
- */
-#undef FALSE
-#define        FALSE   0
-#undef TRUE
-#define        TRUE    1
-
 #define STYLE_FLAT_PROFILE     (1<<0)
 #define STYLE_CALL_GRAPH       (1<<1)
 #define STYLE_SUMMARY_FILE     (1<<2)
@@ -109,7 +98,6 @@ typedef enum
   }
 File_Format;
 
-typedef int bool;
 typedef unsigned char UNIT[2]; /* unit of profiling */
 
 extern const char *whoami;     /* command-name, for error messages */
@@ -120,24 +108,24 @@ extern long hz;                   /* ticks per second */
 /*
  * Command-line options:
  */
-extern int debug_level;                /* debug level */
+extern int debug_level;                        /* debug level */
 extern int output_style;
-extern int output_width;       /* controls column width in index */
-extern bool bsd_style_output;  /* as opposed to FSF style output */
-extern bool demangle;          /* demangle symbol names? */
-extern bool discard_underscores;       /* discard leading underscores? */
-extern bool ignore_direct_calls;       /* don't count direct calls */
-extern bool ignore_static_funcs;       /* suppress static functions */
-extern bool ignore_zeros;      /* ignore unused symbols/files */
-extern bool line_granularity;  /* function or line granularity? */
-extern bool print_descriptions;        /* output profile description */
-extern bool print_path;                /* print path or just filename? */
-extern bool ignore_non_functions;/* Ignore non-function symbols.  */
-
-extern File_Format file_format;        /* requested file format */
-
-extern bool first_output;      /* no output so far? */
-
-extern void done PARAMS ((int status));
+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 File_Format file_format;                /* requested file format */
+
+extern boolean first_output;           /* no output so far? */
+
+extern void done PARAMS ((int status)) ATTRIBUTE_NORETURN;
 
 #endif /* gprof_h */