From: Alan Modra <amodra@gmail.com>
Date: Sun, 29 Jul 2012 04:09:18 +0000 (+0000)
Subject: 	* gprof.h: Don't include gconfig.h twice.  Undef conflicting
X-Git-Tag: sid-snapshot-20120801~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d59b9bb4150376a3f2af90f495e327f803103ab6;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 99e2aaab3bc..fd4ee03f78d 100644
--- 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 0856976eef1..69527fc29b4 100644
--- 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