merge from gcc

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

diff --git a/gprof/gprof.h b/gprof/gprof.h
index b0679ff61d109e83b875b2e31060750efb6f9454..0856976eef1a9578b586caf00d54ae6cd2bd2df8 100644 (file)
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -29,6 +29,10 @@
 #ifndef gprof_h
 #define gprof_h
 
+#include "gconfig.h"
+
+#undef PACKAGE
+
 /* Include the BFD sysdep.h file.  */
 #include "sysdep.h"
 #include "bfd.h"
@@ -68,8 +72,6 @@
 #define _(String) gettext (String)
 #endif
 
-#include "bin-bugs.h"
-
 #define STYLE_FLAT_PROFILE     (1<<0)
 #define STYLE_CALL_GRAPH       (1<<1)
 #define STYLE_SUMMARY_FILE     (1<<2)
@@ -121,7 +123,6 @@ extern int output_style;
 extern int output_width;               /* controls column width in index */
 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 */
@@ -134,6 +135,6 @@ extern File_Format file_format;             /* requested file format */
 
 extern bfd_boolean first_output;       /* no output so far? */
 
-extern void done PARAMS ((int status)) ATTRIBUTE_NORETURN;
+extern void done (int status) ATTRIBUTE_NORETURN;
 
 #endif /* gprof_h */