diff options
author | Alexander Larsson <alexl@redhat.com> | 2016-05-25 11:00:19 +0200 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-05-25 14:01:39 +0000 |
commit | d36862479860df5b133dca51dbf0607bbe849a5b (patch) | |
tree | aeb1b247b5eb3c6a094b0e772921378faee0349f | |
parent | 2f2af9252db84b2a0c91324788722c4335411c8b (diff) | |
download | ostree-d36862479860df5b133dca51dbf0607bbe849a5b.tar.gz |
Build on older versions of glib
Various places need to include libglnx.h for the autoptr backport
fallbacks to be there before ostree-autocleanups.h is included.
This fixes the build on centos7ยท
Closes: #309
Approved by: giuseppe
-rw-r--r-- | src/libostree/ostree-core.c | 2 | ||||
-rw-r--r-- | src/libostree/ostree-diff.c | 1 | ||||
-rw-r--r-- | src/libostree/ostree-fetcher.c | 1 | ||||
-rw-r--r-- | src/libostree/ostree-repo-pull.c | 1 | ||||
-rw-r--r-- | src/libostree/ostree-repo-traverse.c | 1 | ||||
-rw-r--r-- | src/ostree/ot-admin-builtin-instutil.c | 2 | ||||
-rw-r--r-- | src/ostree/ot-admin-functions.c | 1 | ||||
-rw-r--r-- | src/ostree/ot-builtin-admin.c | 2 | ||||
-rw-r--r-- | src/ostree/ot-editor.c | 2 | ||||
-rw-r--r-- | src/ostree/ot-main.c | 2 | ||||
-rw-r--r-- | src/ostree/ot-main.h | 2 |
11 files changed, 11 insertions, 6 deletions
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c index 55ff4d63..00f767b3 100644 --- a/src/libostree/ostree-core.c +++ b/src/libostree/ostree-core.c @@ -26,11 +26,11 @@ #include <stdio.h> #include <stdlib.h> #include <gio/gfiledescriptorbased.h> +#include "libglnx.h" #include "ostree.h" #include "ostree-core-private.h" #include "ostree-chain-input-stream.h" #include "otutil.h" -#include "libglnx.h" #define ALIGN_VALUE(this, boundary) \ (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1))) diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c index 4b733461..84961028 100644 --- a/src/libostree/ostree-diff.c +++ b/src/libostree/ostree-diff.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libglnx.h" #include "ostree.h" #include "otutil.h" diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c index 91b419a5..d956d959 100644 --- a/src/libostree/ostree-fetcher.c +++ b/src/libostree/ostree-fetcher.c @@ -25,6 +25,7 @@ #include <gio/gfiledescriptorbased.h> #include <gio/gunixoutputstream.h> +#include "libglnx.h" #include "ostree-fetcher.h" #ifdef HAVE_LIBSOUP_CLIENT_CERTS #include "ostree-tls-cert-interaction.h" diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 619657c7..2f382856 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libglnx.h" #include "ostree.h" #include "ostree-core-private.h" #include "ostree-repo-private.h" diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c index bb437c38..503ab329 100644 --- a/src/libostree/ostree-repo-traverse.c +++ b/src/libostree/ostree-repo-traverse.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libglnx.h" #include "ostree.h" #include "otutil.h" diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c index 1087b381..88894a6a 100644 --- a/src/ostree/ot-admin-builtin-instutil.c +++ b/src/ostree/ot-admin-builtin-instutil.c @@ -20,11 +20,11 @@ #include "config.h" +#include "ot-main.h" #include "ot-builtins.h" #include "ot-admin-instutil-builtins.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "ostree.h" #include <glib/gi18n.h> diff --git a/src/ostree/ot-admin-functions.c b/src/ostree/ot-admin-functions.c index bc9034e1..ed4dfdfb 100644 --- a/src/ostree/ot-admin-functions.c +++ b/src/ostree/ot-admin-functions.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libglnx.h" #include "ot-admin-functions.h" #include "otutil.h" #include "ostree.h" diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c index 8b866170..7e7b04b5 100644 --- a/src/ostree/ot-builtin-admin.c +++ b/src/ostree/ot-builtin-admin.c @@ -22,10 +22,10 @@ #include "config.h" +#include "ot-main.h" #include "ot-builtins.h" #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "ostree.h" #include "ostree-repo-file.h" diff --git a/src/ostree/ot-editor.c b/src/ostree/ot-editor.c index 4c29c81e..2e045844 100644 --- a/src/ostree/ot-editor.c +++ b/src/ostree/ot-editor.c @@ -22,9 +22,9 @@ #include "config.h" +#include "libglnx.h" #include "ot-editor.h" #include "libgsystem.h" -#include "libglnx.h" #include <sys/wait.h> #include <string.h> diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c index 93f841dc..18c13239 100644 --- a/src/ostree/ot-main.c +++ b/src/ostree/ot-main.c @@ -27,9 +27,9 @@ #include <stdlib.h> #include <string.h> +#include "ot-main.h" #include "ostree.h" #include "ot-admin-functions.h" -#include "ot-main.h" #include "otutil.h" static char *opt_repo; diff --git a/src/ostree/ot-main.h b/src/ostree/ot-main.h index 32620c52..3bb75243 100644 --- a/src/ostree/ot-main.h +++ b/src/ostree/ot-main.h @@ -22,8 +22,8 @@ #pragma once -#include "ostree.h" #include "libglnx.h" +#include "ostree.h" typedef enum { OSTREE_BUILTIN_FLAG_NONE = 0, |