Skip to content

Commit

Permalink
Build on older versions of glib
Browse files Browse the repository at this point in the history
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·
  • Loading branch information
alexlarsson committed May 25, 2016
1 parent 2f2af92 commit ed476f9
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/libostree/ostree-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
1 change: 1 addition & 0 deletions src/libostree/ostree-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include "config.h"

#include "libglnx.h"
#include "ostree.h"
#include "otutil.h"

Expand Down
1 change: 1 addition & 0 deletions src/libostree/ostree-fetcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/libostree/ostree-repo-pull.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include "config.h"

#include "libglnx.h"
#include "ostree.h"
#include "ostree-core-private.h"
#include "ostree-repo-private.h"
Expand Down
1 change: 1 addition & 0 deletions src/libostree/ostree-repo-traverse.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include "config.h"

#include "libglnx.h"
#include "ostree.h"
#include "otutil.h"

Expand Down
2 changes: 1 addition & 1 deletion src/ostree/ot-admin-builtin-instutil.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/ostree/ot-admin-functions.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include "config.h"

#include "libglnx.h"
#include "ot-admin-functions.h"
#include "otutil.h"
#include "ostree.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ostree/ot-builtin-admin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/ostree/ot-editor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ostree/ot-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/ostree/ot-main.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#pragma once

#include "ostree.h"
#include "libglnx.h"
#include "ostree.h"

typedef enum {
OSTREE_BUILTIN_FLAG_NONE = 0,
Expand Down

0 comments on commit ed476f9

Please sign in to comment.