From patchwork Wed Jan 1 00:00:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksei Vetrov via Libabigail X-Patchwork-Id: 38994 X-Patchwork-Original-From: libabigail@sourceware.org (Matthias Maennich via libabigail) From: Aleksei Vetrov via Libabigail Date: Wed, 01 Jan 2020 00:00:00 -0000 Subject: [PATCH] Fix / add include guards Message-ID: <20200127074102.117374-1-maennich@google.com> Fix the include guards of abg-dwarf-reader.h and abg-reporter-priv.h by moving them before any other includes where they actually belongs. Add missing include guards for abg-libxml-utils.h and abg-libzip-utils.h. * include/abg-dwarf-reader.h: Move include guard to the beginning. * include/abg-reporter-priv.h: Likewise. * include/abg-libxml-utils.h: Add include guard. * include/abg-libzip-utils.h: Likewise. Signed-off-by: Matthias Maennich --- include/abg-dwarf-reader.h | 6 +++--- include/abg-libxml-utils.h | 4 ++++ include/abg-libzip-utils.h | 4 ++++ src/abg-reporter-priv.h | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/abg-dwarf-reader.h b/include/abg-dwarf-reader.h index 641428fa6499..08c983af865a 100644 --- a/include/abg-dwarf-reader.h +++ b/include/abg-dwarf-reader.h @@ -26,14 +26,14 @@ /// de-serialize an instance of @ref abigail::corpus from a file in /// elf format, containing dwarf information. +#ifndef __ABG_DWARF_READER_H__ +#define __ABG_DWARF_READER_H__ + #include #include #include "abg-corpus.h" #include "abg-suppression.h" -#ifndef __ABG_DWARF_READER_H__ -#define __ABG_DWARF_READER_H__ - namespace abigail { diff --git a/include/abg-libxml-utils.h b/include/abg-libxml-utils.h index e90ed769b734..54f508368019 100644 --- a/include/abg-libxml-utils.h +++ b/include/abg-libxml-utils.h @@ -20,6 +20,9 @@ /// @file +#ifndef __ABG_LIBXML_UTILS_H__ +#define __ABG_LIBXML_UTILS_H__ + #include #include "abg-sptr-utils.h" #include "abg-cxx-compat.h" @@ -119,3 +122,4 @@ unescape_xml_comment(const std::string& str); }//end namespace xml }//end namespace abigail +#endif //__ABG_LIBXML_UTILS_H__ diff --git a/include/abg-libzip-utils.h b/include/abg-libzip-utils.h index 98a326f5f7a1..bed4eacd250f 100644 --- a/include/abg-libzip-utils.h +++ b/include/abg-libzip-utils.h @@ -20,6 +20,9 @@ /// @file +#ifndef __ABG_LIBZIP_UTILS_H__ +#define __ABG_LIBZIP_UTILS_H__ + #include #include "abg-cxx-compat.h" @@ -70,3 +73,4 @@ zip_file_sptr open_file_in_archive(zip_sptr archive, }// end namespace zip }// end namespace abigail +#endif //__ABG_LIBZIP_UTILS_H__ diff --git a/src/abg-reporter-priv.h b/src/abg-reporter-priv.h index 530b748800e3..aece9ea65fa2 100644 --- a/src/abg-reporter-priv.h +++ b/src/abg-reporter-priv.h @@ -20,12 +20,12 @@ // // Author: Dodji Seketeli -#include "abg-comparison.h" -#include "abg-reporter.h" - #ifndef __ABG_REPORTER_PRIV_H__ #define __ABG_REPORTER_PRIV_H__ +#include "abg-comparison.h" +#include "abg-reporter.h" + /// This is a subroutine of a *::report() function. /// /// If the diff about two subjects S1 and S2 was reported earlier or