From 9df846559a8e7364ac710e6f5250f7f2001a37ea Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 4 Jul 2016 10:31:27 +0000 Subject: [PATCH] libostree: Fix build failure with glib 2.42 G_DEFINE_AUTOPTR_CLEANUP_FUNC is a new function in GLib 2.44, but libglnx contains a backported version of it. A few source files were however using G_DEFINE_AUTOPTR_CLEANUP_FUNC either without including libglnx.h, or without including it early enough. This fix is similar to the one in commit d368624. Closes #376 Closes: #377 Approved by: smcv --- src/libostree/ostree-gpg-verifier.c | 1 + src/libostree/ostree-repo-pull.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c index 0ec0b515..d487507f 100644 --- a/src/libostree/ostree-gpg-verifier.c +++ b/src/libostree/ostree-gpg-verifier.c @@ -23,6 +23,7 @@ #include "config.h" +#include "libglnx.h" #include "ostree-gpg-verifier.h" #include "ostree-gpg-verify-result-private.h" #include "otutil.h" diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 2d590bb5..438f5958 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -22,12 +22,12 @@ #include "config.h" +#include "libglnx.h" #include "ostree.h" #include "otutil.h" #ifdef HAVE_LIBSOUP -#include "libglnx.h" #include "ostree-core-private.h" #include "ostree-repo-private.h" #include "ostree-repo-static-delta-private.h"