2009-09-01 Tristan Gingold <gingold@adacore.com>

[deliverable/binutils-gdb.git] / bfd / coff-x86_64.c

diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
index 78a788670b96d22ef5fce3e4234fe15a1c5a5f00..3d7ff609c5f77afa70f520ad545269fe871e37bb 100644 (file)
--- a/bfd/coff-x86_64.c
+++ b/bfd/coff-x86_64.c
@@ -24,6 +24,10 @@
 #define COFF_WITH_pex64
 #endif
 
+/* Note we have to make sure not to include headers twice.
+   Not all headers are wrapped in #ifdef guards, so we define
+   PEI_HEADERS to prevent double including here.  */
+#ifndef PEI_HEADERS
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"
@@ -32,6 +36,7 @@
 #include "coff/pe.h"
 #include "libcoff.h"
 #include "libiberty.h"
+#endif
 
 #define BADMAG(x) AMD64BADMAG(x)
 
@@ -712,7 +717,7 @@ coff_amd64_is_local_label_name (bfd *abfd, const char *name)
 #endif /* TARGET_UNDERSCORE */
 
 #ifndef bfd_pe_print_pdata
-#define bfd_pe_print_pdata     NULL
+#define bfd_pe_print_pdata   NULL
 #endif
 
 #include "coffcode.h"