diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-07-12 15:25:00 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-07-12 15:25:00 +0200 |
| commit | 11f92b12dbd029fa93618bc5f23cba18e794a132 (patch) | |
| tree | 9167ac5ce93c1cd98be1f0dd59a3f6db3fc0f86b /apt-inst/contrib | |
| parent | 46e1aa6afd4239e263ce52525c09eb004b67405f (diff) | |
| parent | 51da6127d0073c9fc81f4b220f2360bd612ded5c (diff) | |
Merge branch 'misc/include-cleanup'
This should make it easier to read includes.
Diffstat (limited to 'apt-inst/contrib')
| -rw-r--r-- | apt-inst/contrib/arfile.cc | 8 | ||||
| -rw-r--r-- | apt-inst/contrib/arfile.h | 3 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 16 |
3 files changed, 13 insertions, 14 deletions
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 905110781..26c85d066 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -14,16 +14,16 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include<config.h> +#include <config.h> #include <apt-pkg/arfile.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> #include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> +#include <string> #include <string.h> #include <sys/types.h> -#include <string> #include <apti18n.h> /*}}}*/ diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 297303a9d..47624c72a 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -15,9 +15,8 @@ #ifndef PKGLIB_ARFILE_H #define PKGLIB_ARFILE_H - -#include <string> #include <apt-pkg/macros.h> +#include <string> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/fileutl.h> #endif diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 60360053e..69e43d6a1 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -16,22 +16,22 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include<config.h> +#include <config.h> +#include <apt-pkg/configuration.h> #include <apt-pkg/dirstream.h> -#include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/configuration.h> +#include <apt-pkg/extracttar.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> -#include <string.h> #include <algorithm> +#include <iostream> #include <string> -#include <unistd.h> -#include <signal.h> #include <fcntl.h> -#include <iostream> +#include <signal.h> +#include <string.h> +#include <unistd.h> #include <apti18n.h> /*}}}*/ |