Build with GLib 2.32 as well

Needed by NetworkManager.

8 files changed, 23 insertions, 0 deletions

diff --git a/Makefile-libgsystem.am b/Makefile-libgsystem.am
index 9e027ae..0b3f3e1 100644
--- a/Makefile-libgsystem.am
+++ b/Makefile-libgsystem.am
@@ -35,6 +35,7 @@ libgsystem_la_SOURCES = \
 	$(libgsystem_srcpath)/gsystem-subprocess.c \
 	$(libgsystem_srcpath)/libgsystem.h \
 	$(NULL)
+
 libgsystem_la_CFLAGS = $(AM_CFLAGS) $(libgsystem_cflags)
 libgsystem_la_LDFLAGS = -avoid-version -Bsymbolic-functions -export-symbols-regex "^gs_" -no-undefined -export-dynamic
 libgsystem_la_LIBADD = $(libgsystem_libs)
diff --git a/gsystem-file-utils.c b/gsystem-file-utils.c
index 38b8420..a074a5d 100644
--- a/gsystem-file-utils.c
+++ b/gsystem-file-utils.c
@@ -166,6 +166,7 @@ gs_file_map_noatime (GFile         *file,
   return ret;
 }
 
+#if GLIB_CHECK_VERSION(2,34,0)
 /**
  * gs_file_map_readonly:
  * @file: a #GFile
@@ -196,6 +197,7 @@ gs_file_map_readonly (GFile         *file,
   g_mapped_file_unref (mfile);
   return ret;
 }
+#endif
 
 /**
  * gs_file_sync_data:
diff --git a/gsystem-file-utils.h b/gsystem-file-utils.h
index 420ec50..0cabcb5 100644
--- a/gsystem-file-utils.h
+++ b/gsystem-file-utils.h
@@ -36,9 +36,11 @@ GMappedFile *gs_file_map_noatime (GFile         *file,
                                   GCancellable  *cancellable,
                                   GError       **error);
 
+#if GLIB_CHECK_VERSION(2,34,0)
 GBytes *gs_file_map_readonly (GFile         *file,
                               GCancellable  *cancellable,
                               GError       **error);
+#endif
 
 gboolean gs_file_sync_data (GFile          *file,
                             GCancellable   *cancellable,
diff --git a/gsystem-subprocess-context.c b/gsystem-subprocess-context.c
index cf5eac8..125042a 100644
--- a/gsystem-subprocess-context.c
+++ b/gsystem-subprocess-context.c
@@ -22,6 +22,8 @@
 
 #include "libgsystem.h"
 
+#if GLIB_CHECK_VERSION(2,34,0)
+
 #ifdef G_OS_UNIX
 #include <gio/gunixoutputstream.h>
 #include <gio/gfiledescriptorbased.h>
@@ -495,3 +497,5 @@ gs_subprocess_context_open_pipe_write (GSSubprocessContext         *self,
 }
 
 #endif
+
+#endif
diff --git a/gsystem-subprocess-context.h b/gsystem-subprocess-context.h
index eaec315..b8a2401 100644
--- a/gsystem-subprocess-context.h
+++ b/gsystem-subprocess-context.h
@@ -23,6 +23,8 @@
 
 #include <gio/gio.h>
 
+#if GLIB_CHECK_VERSION(2,34,0)
+
 G_BEGIN_DECLS
 
 #define GS_TYPE_SUBPROCESS_CONTEXT         (gs_subprocess_context_get_type ())
@@ -123,3 +125,4 @@ void             gs_subprocess_context_set_child_setup        (GSSubprocessConte
 G_END_DECLS
 
 #endif
+#endif
diff --git a/gsystem-subprocess.c b/gsystem-subprocess.c
index ab5bbb7..a967896 100644
--- a/gsystem-subprocess.c
+++ b/gsystem-subprocess.c
@@ -21,6 +21,8 @@
 #define _GSYSTEM_NO_LOCAL_ALLOC
 #include "libgsystem.h"
 
+#if GLIB_CHECK_VERSION(2,34,0)
+
 /**
  * SECTION:gssubprocess
  * @title: GSSubprocess
@@ -961,3 +963,5 @@ gs_subprocess_simple_run_sync (const char                    *cwd,
     g_object_unref (proc);
   return ret;
 }
+
+#endif
diff --git a/gsystem-subprocess.h b/gsystem-subprocess.h
index cc66978..5a0316e 100644
--- a/gsystem-subprocess.h
+++ b/gsystem-subprocess.h
@@ -21,6 +21,10 @@
 #ifndef __GSYSTEM_SUBPROCESS_H__
 #define __GSYSTEM_SUBPROCESS_H__
 
+#include <gio/gio.h>
+
+#if GLIB_CHECK_VERSION(2,34,0)
+
 #include "gsystem-subprocess-context.h"
 
 G_BEGIN_DECLS
@@ -94,3 +98,4 @@ gboolean          gs_subprocess_simple_run_sync (const char                    *
 G_END_DECLS
 
 #endif
+#endif
diff --git a/libgsystem.h b/libgsystem.h
index 2dc13a6..c7aea6c 100644
--- a/libgsystem.h
+++ b/libgsystem.h
@@ -28,7 +28,9 @@ G_BEGIN_DECLS
 #include <gsystem-console.h>
 #include <gsystem-file-utils.h>
 #include <gsystem-shutil.h>
+#if GLIB_CHECK_VERSION(2,34,0)
 #include <gsystem-subprocess.h>
+#endif
 #include <gsystem-log.h>
 #ifndef _GSYSTEM_NO_LOCAL_ALLOC
 #include <gsystem-local-alloc.h>