From f1d9196076d4aea1f64e0d2cbd17bfa2891b8c4c Mon Sep 17 00:00:00 2001
From: Matthew Leeds <matthew.leeds@endlessm.com>
Date: Wed, 30 May 2018 17:20:08 -0700
Subject: [PATCH] lib: Fix building against old glib versions

This commit includes libglnx.h in ostree-autocleanups.h, so we get the
g_autoptr backports wherever they're needed. Also, remove the "#include
libglnx.h" lines elsewhere that are no longer needed.

Closes: #1596
Approved by: cgwalters
---
 src/libostree/ostree-autocleanups.h         | 1 +
 src/libostree/ostree-ref.c                  | 1 -
 src/libostree/ostree-repo-finder-config.c   | 1 -
 src/libostree/ostree-repo-finder-mount.c    | 1 -
 src/libostree/ostree-repo-finder-override.c | 1 -
 src/libostree/ostree-repo.c                 | 1 -
 tests/test-repo-finder-mount.c              | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/libostree/ostree-autocleanups.h b/src/libostree/ostree-autocleanups.h
index 504954e0..d1c94410 100644
--- a/src/libostree/ostree-autocleanups.h
+++ b/src/libostree/ostree-autocleanups.h
@@ -24,6 +24,7 @@
 #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 0954cb0e..9a410499 100644
--- a/src/libostree/ostree-ref.c
+++ b/src/libostree/ostree-ref.c
@@ -27,7 +27,6 @@
 #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 5d1e1595..58cf321c 100644
--- a/src/libostree/ostree-repo-finder-config.c
+++ b/src/libostree/ostree-repo-finder-config.c
@@ -28,7 +28,6 @@
 #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 09e85035..117033df 100644
--- a/src/libostree/ostree-repo-finder-mount.c
+++ b/src/libostree/ostree-repo-finder-mount.c
@@ -28,7 +28,6 @@
 #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 5bad9ace..0ee0270d 100644
--- a/src/libostree/ostree-repo-finder-override.c
+++ b/src/libostree/ostree-repo-finder-override.c
@@ -28,7 +28,6 @@
 #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 3251880f..43c18767 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -28,7 +28,6 @@
 #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 55eb47fb..948a3245 100644
--- a/tests/test-repo-finder-mount.c
+++ b/tests/test-repo-finder-mount.c
@@ -27,7 +27,6 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <libglnx.h>
 #include <locale.h>
 
 #include "libostreetest.h"