diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2018-06-06 13:05:28 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-07 17:28:49 +0000 |
| commit | 1d830c17922c14b08d208f5d5b5f091851037470 (patch) | |
| tree | c2b90a01ebfe17b3bb3262dae00fff29868b965f | |
| parent | 8fbf19c9f54ba34ae7ebbc540b08566b8dd18848 (diff) | |
| download | ostree-1d830c17922c14b08d208f5d5b5f091851037470.tar.gz | |
Revert "lib: Fix building against old glib versions"
This reverts commit f1d9196076d4aea1f64e0d2cbd17bfa2891b8c4c.
Since libglnx.h does not get installed, it can't be included in
ostree-autocleanups.h, which is included by ostree.h.
Closes: #1615
Approved by: jlebon
| -rw-r--r-- | src/libostree/ostree-autocleanups.h | 1 | ||||
| -rw-r--r-- | src/libostree/ostree-ref.c | 1 | ||||
| -rw-r--r-- | src/libostree/ostree-repo-finder-config.c | 1 | ||||
| -rw-r--r-- | src/libostree/ostree-repo-finder-mount.c | 1 | ||||
| -rw-r--r-- | src/libostree/ostree-repo-finder-override.c | 1 | ||||
| -rw-r--r-- | src/libostree/ostree-repo.c | 1 | ||||
| -rw-r--r-- | tests/test-repo-finder-mount.c | 1 |
7 files changed, 6 insertions, 1 deletions
diff --git a/src/libostree/ostree-autocleanups.h b/src/libostree/ostree-autocleanups.h index ae678721..9a54aee7 100644 --- a/src/libostree/ostree-autocleanups.h +++ b/src/libostree/ostree-autocleanups.h @@ -24,7 +24,6 @@ #pragma once #include <ostree.h> -#include <libglnx.h> G_BEGIN_DECLS diff --git a/src/libostree/ostree-ref.c b/src/libostree/ostree-ref.c index 34d67240..35fd5821 100644 --- a/src/libostree/ostree-ref.c +++ b/src/libostree/ostree-ref.c @@ -27,6 +27,7 @@ #include <gio/gio.h> #include <glib.h> #include <glib-object.h> +#include <libglnx.h> #include "ostree-autocleanups.h" #include "ostree-core.h" diff --git a/src/libostree/ostree-repo-finder-config.c b/src/libostree/ostree-repo-finder-config.c index 8e617afc..4366d72a 100644 --- a/src/libostree/ostree-repo-finder-config.c +++ b/src/libostree/ostree-repo-finder-config.c @@ -28,6 +28,7 @@ #include <gio/gio.h> #include <glib.h> #include <glib-object.h> +#include <libglnx.h> #include "ostree-autocleanups.h" #include "ostree-remote-private.h" diff --git a/src/libostree/ostree-repo-finder-mount.c b/src/libostree/ostree-repo-finder-mount.c index 864510e5..c259f3e6 100644 --- a/src/libostree/ostree-repo-finder-mount.c +++ b/src/libostree/ostree-repo-finder-mount.c @@ -28,6 +28,7 @@ #include <gio/gunixmounts.h> #include <glib.h> #include <glib-object.h> +#include <libglnx.h> #include <stdlib.h> #include "ostree-autocleanups.h" diff --git a/src/libostree/ostree-repo-finder-override.c b/src/libostree/ostree-repo-finder-override.c index 6917dbe0..32199546 100644 --- a/src/libostree/ostree-repo-finder-override.c +++ b/src/libostree/ostree-repo-finder-override.c @@ -28,6 +28,7 @@ #include <gio/gio.h> #include <glib.h> #include <glib-object.h> +#include <libglnx.h> #include "ostree-autocleanups.h" #include "ostree-remote-private.h" diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 52784b4c..f3da1cae 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -28,6 +28,7 @@ #include <gio/gunixinputstream.h> #include <gio/gunixoutputstream.h> #include <gio/gfiledescriptorbased.h> +#include "libglnx.h" #include "otutil.h" #include <glnx-console.h> diff --git a/tests/test-repo-finder-mount.c b/tests/test-repo-finder-mount.c index 948a3245..55eb47fb 100644 --- a/tests/test-repo-finder-mount.c +++ b/tests/test-repo-finder-mount.c @@ -27,6 +27,7 @@ #include <gio/gio.h> #include <glib.h> #include <glib-object.h> +#include <libglnx.h> #include <locale.h> #include "libostreetest.h" |