From 3361d3286de6feaae21886d77ad22ea1c36d601d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 12 Dec 2009 17:41:44 +0000 Subject: [PATCH] tag: don't use GLib 2.22 API g_mapped_file_unref() was introduced in GLib 2.22, but we depend only on GLib 2.18, so use g_mapped_file_free() when compiling against older GLib versions until we bump the GLib dependency. --- gst-libs/gst/tag/lang.c | 5 +++++ gst-libs/gst/tag/mklangtables.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/gst-libs/gst/tag/lang.c b/gst-libs/gst/tag/lang.c index 1a7de69089..695f93cd72 100644 --- a/gst-libs/gst/tag/lang.c +++ b/gst-libs/gst/tag/lang.c @@ -49,6 +49,11 @@ #include "lang-tables.c" +/* FIXME: remove once we depend on GLib >= 2.22 */ +#if !GLIB_CHECK_VERSION (2, 22, 0) +#define g_mapped_file_unref g_mapped_file_free +#endif + #ifndef GST_DISABLE_GST_DEBUG #define GST_CAT_DEFAULT ensure_debug_category() diff --git a/gst-libs/gst/tag/mklangtables.c b/gst-libs/gst/tag/mklangtables.c index ab4e56b806..5d4c69323e 100644 --- a/gst-libs/gst/tag/mklangtables.c +++ b/gst-libs/gst/tag/mklangtables.c @@ -30,6 +30,10 @@ #include #include +#if !GLIB_CHECK_VERSION (2, 22, 0) +#define g_mapped_file_unref g_mapped_file_free +#endif + #define ISO_639_XML_PATH ISO_CODES_PREFIX "/share/xml/iso-codes/iso_639.xml" typedef struct