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
This commit is contained in:
Alexander Larsson authored and Atomic Bot committed 2016-05-25 14:01:39 +00:00
1 parent 2f2af9252d
commit d368624798
11 files changed
+11 -6

No files matched your search

+1 -1
View File
@@ -26,11 +26,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <gio/gfiledescriptorbased.h> #include <gio/gfiledescriptorbased.h>
#include "libglnx.h"
#include "ostree.h" #include "ostree.h"
#include "ostree-core-private.h" #include "ostree-core-private.h"
#include "ostree-chain-input-stream.h" #include "ostree-chain-input-stream.h"
#include "otutil.h" #include "otutil.h"
#include "libglnx.h"
#define ALIGN_VALUE(this, boundary) \ #define ALIGN_VALUE(this, boundary) \
(( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1))) (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
+1
View File
@@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include "libglnx.h"
#include "ostree.h" #include "ostree.h"
#include "otutil.h" #include "otutil.h"
+1
View File
@@ -25,6 +25,7 @@
#include <gio/gfiledescriptorbased.h> #include <gio/gfiledescriptorbased.h>
#include <gio/gunixoutputstream.h> #include <gio/gunixoutputstream.h>
#include "libglnx.h"
#include "ostree-fetcher.h" #include "ostree-fetcher.h"
#ifdef HAVE_LIBSOUP_CLIENT_CERTS #ifdef HAVE_LIBSOUP_CLIENT_CERTS
#include "ostree-tls-cert-interaction.h" #include "ostree-tls-cert-interaction.h"
+1
View File
@@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include "libglnx.h"
#include "ostree.h" #include "ostree.h"
#include "ostree-core-private.h" #include "ostree-core-private.h"
#include "ostree-repo-private.h" #include "ostree-repo-private.h"
+1
View File
@@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include "libglnx.h"
#include "ostree.h" #include "ostree.h"
#include "otutil.h" #include "otutil.h"
+1 -1
View File
@@ -20,11 +20,11 @@
#include "config.h" #include "config.h"
#include "ot-main.h"
#include "ot-builtins.h" #include "ot-builtins.h"
#include "ot-admin-instutil-builtins.h" #include "ot-admin-instutil-builtins.h"
#include "ot-admin-builtins.h" #include "ot-admin-builtins.h"
#include "ot-admin-functions.h" #include "ot-admin-functions.h"
#include "ot-main.h"
#include "ostree.h" #include "ostree.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>
+1
View File
@@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include "libglnx.h"
#include "ot-admin-functions.h" #include "ot-admin-functions.h"
#include "otutil.h" #include "otutil.h"
#include "ostree.h" #include "ostree.h"
+1 -1
View File
@@ -22,10 +22,10 @@
#include "config.h" #include "config.h"
#include "ot-main.h"
#include "ot-builtins.h" #include "ot-builtins.h"
#include "ot-admin-builtins.h" #include "ot-admin-builtins.h"
#include "ot-admin-functions.h" #include "ot-admin-functions.h"
#include "ot-main.h"
#include "ostree.h" #include "ostree.h"
#include "ostree-repo-file.h" #include "ostree-repo-file.h"
+1 -1
View File
@@ -22,9 +22,9 @@
#include "config.h" #include "config.h"
#include "libglnx.h"
#include "ot-editor.h" #include "ot-editor.h"
#include "libgsystem.h" #include "libgsystem.h"
#include "libglnx.h"
#include <sys/wait.h> #include <sys/wait.h>
#include <string.h> #include <string.h>
+1 -1
View File
@@ -27,9 +27,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "ot-main.h"
#include "ostree.h" #include "ostree.h"
#include "ot-admin-functions.h" #include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h" #include "otutil.h"
static char *opt_repo; static char *opt_repo;
+1 -1
View File
@@ -22,8 +22,8 @@
#pragma once #pragma once
#include "ostree.h"
#include "libglnx.h" #include "libglnx.h"
#include "ostree.h"
typedef enum { typedef enum {
OSTREE_BUILTIN_FLAG_NONE = 0, OSTREE_BUILTIN_FLAG_NONE = 0,