From 91a199b9fd80cc2c023278aa27ffa0599a87f22f Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl@lucon.org>
Date: Sat, 29 Oct 2005 23:00:12 +0000
Subject: [PATCH] 2005-10-29  H.J. Lu  <hongjiu.lu@intel.com>

	* hpux-core.c: Include <machine/reg.h> only if HPUX_CORE is
	define.
	* osf-core.c: Include <sys/core.h> only if OSF_CORE is defined.
	* sco5-core.c: Include <sys/paccess.h> and <sys/region.h> only
	if SCO5_CORE is defined.
---
 bfd/ChangeLog   | 8 ++++++++
 bfd/hpux-core.c | 2 ++
 bfd/osf-core.c  | 2 ++
 bfd/sco5-core.c | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 22bd2a77f2..8644e75360 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* hpux-core.c: Include <machine/reg.h> only if HPUX_CORE is
+	define.
+	* osf-core.c: Include <sys/core.h> only if OSF_CORE is defined.
+	* sco5-core.c: Include <sys/paccess.h> and <sys/region.h> only
+	if SCO5_CORE is defined.
+
 2005-10-29  Mark Kettenis  <kettenis@gnu.org>
 
 	* Makefile.am: Run "make dep-am".
diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c
index e68a715b58..9a97531eb9 100644
--- a/bfd/hpux-core.c
+++ b/bfd/hpux-core.c
@@ -61,7 +61,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 # endif
 #endif
 #include <signal.h>
+#ifdef HPUX_CORE
 #include <machine/reg.h>
+#endif
 #include <sys/user.h>		/* After a.out.h  */
 #include <sys/file.h>
 
diff --git a/bfd/osf-core.c b/bfd/osf-core.c
index 1ad0a362f5..35aa82df43 100644
--- a/bfd/osf-core.c
+++ b/bfd/osf-core.c
@@ -26,7 +26,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #include "libbfd.h"
 
 #include <sys/user.h>
+#ifdef OSF_CORE
 #include <sys/core.h>
+#endif
 
 /* forward declarations */
 
diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c
index f09eadafe8..d10dbfa9d3 100644
--- a/bfd/sco5-core.c
+++ b/bfd/sco5-core.c
@@ -31,8 +31,10 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #include <signal.h>
 
 #include <sys/user.h>		/* After a.out.h  */
+#ifdef SCO5_CORE
 #include <sys/paccess.h>
 #include <sys/region.h>
+#endif
 
 struct sco5_core_struct
 {
-- 
2.11.0