* gprof.h: Don't include gconfig.h twice. Undef conflicting

	PACKAGE_* defines.

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 99e2aaab3bcde0c4bcdb7ff1ea2057d983fb940c..fd4ee03f78d23d300d95830ffc5029f14b50fb67 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-29  Alan Modra  <amodra@gmail.com>
+
+       * gprof.h: Don't include gconfig.h twice.  Undef conflicting
+       PACKAGE_* defines.
+
 2012-07-27  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.in (BFD_VERSION): Run bfd/configure --version and

diff --git a/gprof/gprof.h b/gprof/gprof.h
index 0856976eef1a9578b586caf00d54ae6cd2bd2df8..69527fc29b475363613b16da865f079183d6387c 100644 (file)
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -29,19 +29,15 @@
 #ifndef gprof_h
 #define gprof_h
 
-#include "gconfig.h"
-
-#undef PACKAGE
-
 /* 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.  */
 #undef PACKAGE
-#undef VERSION
-
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 #include "gconfig.h"
 
 #ifndef MIN