diff options
| author | Julian Andres Klode <jak@debian.org> | 2022-05-11 09:21:23 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2022-05-11 09:21:23 +0000 |
| commit | bed5d00b5c6f70ae80d180ef162316e3bafb0ad0 (patch) | |
| tree | 85585f36ef08b56f0ed87bf6342a0c7c24d3a82d /apt-pkg | |
| parent | 4fe52f98c7d12bc8fb07411b1c0594a032eadb3a (diff) | |
| parent | 018cf7c225837b65e2b146788f786685629a5b12 (diff) | |
Merge branch 'ci/nomorelessdocs' into 'main'
Support building with no/less docs and use it more in CI
See merge request apt-team/apt!238
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/fileutl.h | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/proxy.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/metaindex.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/statechanges.cc | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index dd16aa754..f4eefd7c2 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -28,9 +28,6 @@ #include <vector> #include <time.h> -#include <zlib.h> - - /* Define this for python-apt */ #define APT_HAS_GZIP 1 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> |