diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-16 23:41:22 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-16 23:41:22 +0100 |
| commit | 8702319e119008954baa872d50d0e4098e6e83db (patch) | |
| tree | 20abd20bce45653264e2a0dda3e1c7f0364f8cb7 /src/import | |
| parent | 5cd6491b71008334daa9965464e038dc3e39948a (diff) | |
| parent | cf0fbc49e67b55f8d346fc94de28c90113505297 (diff) | |
Merge pull request #1922 from phomes/sort-includes
Sort includes
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/aufs-util.c | 2 | ||||
| -rw-r--r-- | src/import/export-raw.c | 4 | ||||
| -rw-r--r-- | src/import/pull-tar.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/import/aufs-util.c b/src/import/aufs-util.c index 7b1ac134a0..82f519958c 100644 --- a/src/import/aufs-util.c +++ b/src/import/aufs-util.c @@ -21,10 +21,10 @@ #include <ftw.h> +#include "aufs-util.h" #include "rm-rf.h" #include "string-util.h" #include "util.h" -#include "aufs-util.h" static int nftw_cb( const char *fpath, diff --git a/src/import/export-raw.c b/src/import/export-raw.c index 103d45bf21..28c87594d6 100644 --- a/src/import/export-raw.c +++ b/src/import/export-raw.c @@ -20,6 +20,10 @@ ***/ #include <sys/sendfile.h> + +/* When we include libgen.h because we need dirname() we immediately + * undefine basename() since libgen.h defines it as a macro to the POSIX + * version which is really broken. We prefer GNU basename(). */ #include <libgen.h> #undef basename diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index e7fcd293f1..2e48167c54 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <sys/prctl.h> #include <curl/curl.h> +#include <sys/prctl.h> #include "sd-daemon.h" |