2002-02-10 Daniel Jacobowitz <drow@mvista.com>

	* gprof.c: Include "getopt.h" after other includes, so that
	the proper macros are defined.
	* gen-c-prog.awk: Emit a prototype for the generated function.

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 9369e24c9f0ee9843274ce6a1d3336536c01d08b..f7f5faed54fb7518ca2600ab3d2d9d74076fec54 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-10  Daniel Jacobowitz  <drow@mvista.com>
+
+       * gprof.c: Include "getopt.h" after other includes, so that
+       the proper macros are defined.
+       * gen-c-prog.awk: Emit a prototype for the generated function.
+
 2002-02-01  Alan Modra  <amodra@bigpond.net.au>
 
        * configure.in (build_warnings): Add -Wstrict-prototypes

diff --git a/gprof/gen-c-prog.awk b/gprof/gen-c-prog.awk
index b59c1f8d8dd353d0850d25a42c310ce1160eaf14..b235a64a451888c3a33d47d48997b7301cacebab 100644 (file)
--- a/gprof/gen-c-prog.awk
+++ b/gprof/gen-c-prog.awk
@@ -3,6 +3,7 @@ NR == 1 {
     print "/* ==> Do not modify this file!!  It is created automatically"
     printf "   from %s using the gen-c-prog.awk script.  <== */\n\n", FILE
     print "#include <stdio.h>"
+    print "#include \"ansidecl.h\""
 }
 
        {
@@ -12,6 +13,7 @@ NR == 1       {
                print "}"
              curfun = FUNCTION
              print ""
+             print "void ", FUNCTION, "PARAMS ((FILE *));"
              print "void";
              printf "%s (file)\n", FUNCTION
              print "     FILE *file;";

diff --git a/gprof/gprof.c b/gprof/gprof.c
index db6dd9a5cc1d2b8968c00a771b93efc067fc55e8..f73a503e1d8cbcc6f0d9a0d555769d2ee28380b5 100644 (file)
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -16,7 +16,6 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#include "getopt.h"
 #include "libiberty.h"
 #include "gprof.h"
 #include "search_list.h"
@@ -32,6 +31,7 @@
 #include "hist.h"
 #include "sym_ids.h"
 #include "demangle.h"
+#include "getopt.h"
 
 static void usage PARAMS ((FILE *, int)) ATTRIBUTE_NORETURN;
 int main PARAMS ((int, char **));