summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2022-04-22 17:05:36 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2022-05-07 10:45:44 +0200
commit320245536a7ad21606286d9dcf54acf3bdf096c6 (patch)
tree839e81d85af6e50e8e8217717e160f41f0946ba1 /apt-pkg
parente5aa5c04ecbd3cdab611794cebf9eb3aa8cbddd4 (diff)
Include our config.h in all C++ files to avoid ODR violations
Some of our headers use APT_COMPILING_APT trickery to avoid exposing too broadly details we don't want external clients to know and make use of. The flip-side is that this can lead to different compilation units seeing different definitions if they aren't all using the same config.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/contrib/proxy.cc2
-rw-r--r--apt-pkg/metaindex.cc2
-rw-r--r--apt-pkg/statechanges.cc2
3 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/contrib/proxy.cc b/apt-pkg/contrib/proxy.cc
index 6dc3b0686..a99f44f49 100644
--- a/apt-pkg/contrib/proxy.cc
+++ b/apt-pkg/contrib/proxy.cc
@@ -7,6 +7,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc
index fc03f3db0..97996b3f1 100644
--- a/apt-pkg/metaindex.cc
+++ b/apt-pkg/metaindex.cc
@@ -1,4 +1,6 @@
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/indexfile.h>
#include <apt-pkg/metaindex.h>
#include <apt-pkg/pkgcachegen.h>
diff --git a/apt-pkg/statechanges.cc b/apt-pkg/statechanges.cc
index 45468e462..bbcde71d3 100644
--- a/apt-pkg/statechanges.cc
+++ b/apt-pkg/statechanges.cc
@@ -1,3 +1,5 @@
+#include <config.h>
+
#include <apt-pkg/cacheset.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/debsystem.h>