diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-12-12 17:41:44 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-12-12 17:41:44 +0000 |
| commit | 3361d3286de6feaae21886d77ad22ea1c36d601d (patch) | |
| tree | 0a9126187ffefe6c175c98b2fec0dd5f43727c63 | |
| parent | 088c7c07a2525fe83f2c7ffd77b79f4e9db19fb9 (diff) | |
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.
| -rw-r--r-- | gst-libs/gst/tag/lang.c | 5 | ||||
| -rw-r--r-- | gst-libs/gst/tag/mklangtables.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gst-libs/gst/tag/lang.c b/gst-libs/gst/tag/lang.c index 1a7de690..695f93cd 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 ab4e56b8..5d4c6932 100644 --- a/gst-libs/gst/tag/mklangtables.c +++ b/gst-libs/gst/tag/mklangtables.c @@ -30,6 +30,10 @@ #include <glib.h> #include <string.h> +#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 |