From: "Matthias Maennich via libabigail" <libabigail@sourceware.org>
To: libabigail@sourceware.org
Cc: dodji@seketeli.org, kernel-team@android.com, maennich@google.com
Subject: [PATCH] Fix / add include guards
Date: Wed, 01 Jan 2020 00:00:00 -0000 [thread overview]
Message-ID: <20200127074102.117374-1-maennich@google.com> (raw)
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 <maennich@google.com>
---
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 <ostream>
#include <elfutils/libdwfl.h>
#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 <istream>
#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 <zip.h>
#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
--
2.25.0.341.g760bfbb309-goog
next reply other threads:[~2020-01-27 7:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-01 0:00 Matthias Maennich via libabigail [this message]
2020-01-01 0:00 ` Dodji Seketeli
2020-01-01 0:00 ` Matthias Maennich via libabigail
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200127074102.117374-1-maennich@google.com \
--to=libabigail@sourceware.org \
--cc=dodji@seketeli.org \
--cc=kernel-team@android.com \
--cc=maennich@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).