From 0b4395434942ecc6f3006004784d19d9a4fbbf55 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 18 May 2018 08:30:50 +0930 Subject: [PATCH] libbfd.h and libcoff.h include guards * libbfd-in.h: Add include guard. * libcoff-in.h: Likewise. * doc/Makefile.am (libbfd.h, libcoff.h): Append another #endif. * doc/Makefile.in: Regenerate. * libbfd.h: Regenerate. * libcoff.h: Regenerate. --- bfd/ChangeLog | 9 +++++++++ bfd/doc/Makefile.am | 2 ++ bfd/doc/Makefile.in | 2 ++ bfd/libbfd-in.h | 3 +++ bfd/libbfd.h | 4 ++++ bfd/libcoff-in.h | 3 +++ bfd/libcoff.h | 4 ++++ 7 files changed, 27 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d2c5201..85d2fb1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2018-05-18 Alan Modra + + * libbfd-in.h: Add include guard. + * libcoff-in.h: Likewise. + * doc/Makefile.am (libbfd.h, libcoff.h): Append another #endif. + * doc/Makefile.in: Regenerate. + * libbfd.h: Regenerate. + * libcoff.h: Regenerate. + 2018-05-16 Maciej W. Rozycki * elf32-nds32.c (nds32_convert_32_to_16): Preset `insn_type'. diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am index 4657e37..8e9d831 100644 --- a/bfd/doc/Makefile.am +++ b/bfd/doc/Makefile.am @@ -277,6 +277,7 @@ libbfd.h: $(LIBBFD_H_DEP) echo "#ifdef __cplusplus" >> $@ echo "}" >> $@ echo "#endif" >> $@ + echo "#endif" >> $@ LIBCOFF_H_DEP = \ $(srcdir)/../libcoff-in.h \ @@ -299,6 +300,7 @@ libcoff.h: $(LIBCOFF_H_DEP) echo "#ifdef __cplusplus" >> $@ echo "}" >> $@ echo "#endif" >> $@ + echo "#endif" >> $@ BFD_H_DEP = \ $(srcdir)/../bfd-in.h \ diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index a80dc75..6ce67ce 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -1013,6 +1013,7 @@ libbfd.h: $(LIBBFD_H_DEP) echo "#ifdef __cplusplus" >> $@ echo "}" >> $@ echo "#endif" >> $@ + echo "#endif" >> $@ libcoff.h: $(LIBCOFF_H_DEP) echo "$(LIBCOFF_H_DEP)" | sed -f $(srcdir)/header.sed > $@ @@ -1028,6 +1029,7 @@ libcoff.h: $(LIBCOFF_H_DEP) echo "#ifdef __cplusplus" >> $@ echo "}" >> $@ echo "#endif" >> $@ + echo "#endif" >> $@ bfd.h: $(BFD_H_DEP) echo "$(BFD_H_DEP)" | sed -f $(srcdir)/header.sed > $@ diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index d8b445f..a763f97 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -22,6 +22,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef _LIBBFD_H +#define _LIBBFD_H 1 + #include "hashtab.h" #ifdef __cplusplus diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 495ffb4..0fe4a94 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -27,6 +27,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef _LIBBFD_H +#define _LIBBFD_H 1 + #include "hashtab.h" #ifdef __cplusplus @@ -3231,3 +3234,4 @@ bfd_boolean _bfd_generic_verify_endian_match #ifdef __cplusplus } #endif +#endif diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h index d0b18cf..edb1b7d 100644 --- a/bfd/libcoff-in.h +++ b/bfd/libcoff-in.h @@ -19,6 +19,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef _LIBCOFF_H +#define _LIBCOFF_H 1 + #include "bfdlink.h" #include "coff-bfd.h" diff --git a/bfd/libcoff.h b/bfd/libcoff.h index 653a008..a31866f 100644 --- a/bfd/libcoff.h +++ b/bfd/libcoff.h @@ -23,6 +23,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef _LIBCOFF_H +#define _LIBCOFF_H 1 + #include "bfdlink.h" #include "coff-bfd.h" @@ -973,3 +976,4 @@ typedef struct #ifdef __cplusplus } #endif +#endif -- 2.7.4