aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2012-07-29 04:09:18 +0000
committerAlan Modra <amodra@gmail.com>2012-07-29 04:09:18 +0000
commitd59b9bb4150376a3f2af90f495e327f803103ab6 (patch)
treef6931834bf802df02fefc912c9f97cd88b2c43bb
parent703852462405e390b20c10d18f69b2e2e4192238 (diff)
downloadgdb-d59b9bb4150376a3f2af90f495e327f803103ab6.zip
gdb-d59b9bb4150376a3f2af90f495e327f803103ab6.tar.gz
gdb-d59b9bb4150376a3f2af90f495e327f803103ab6.tar.bz2
* gprof.h: Don't include gconfig.h twice. Undef conflicting
PACKAGE_* defines.
-rw-r--r--gprof/ChangeLog5
-rw-r--r--gprof/gprof.h12
2 files changed, 9 insertions, 8 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 99e2aaa..fd4ee03 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 0856976..69527fc 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