From a9f931c467d40afc18a947240cc6875ad7e41c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 26 Mar 2009 11:42:45 +0100 Subject: mxf: Remove some GLib < 2.14 compatibility stuff --- gst/mxf/mxfmetadata.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gst/mxf/mxfmetadata.c') diff --git a/gst/mxf/mxfmetadata.c b/gst/mxf/mxfmetadata.c index 07c18b0f..0aff0317 100644 --- a/gst/mxf/mxfmetadata.c +++ b/gst/mxf/mxfmetadata.c @@ -6962,17 +6962,11 @@ mxf_descriptive_metadata_new (guint8 scheme, guint32 type, return ret; } -/* TODO: Remove this once we depend on GLib 2.14 */ -#if GLIB_CHECK_VERSION (2, 14, 0) -#define __gst_once_init_enter(val) (g_once_init_enter (val)) -#define __gst_once_init_leave(val,newval) (g_once_init_leave (val, newval)) -#endif - GType mxf_descriptive_metadata_framework_get_type (void) { static volatile gsize type = 0; - if (__gst_once_init_enter (&type)) { + if (g_once_init_enter (&type)) { GType _type = 0; static const GTypeInfo info = { sizeof (MXFDescriptiveMetadataFrameworkInterface), @@ -6990,7 +6984,7 @@ mxf_descriptive_metadata_framework_get_type (void) g_type_interface_add_prerequisite (_type, MXF_TYPE_DESCRIPTIVE_METADATA); - __gst_once_init_leave (&type, (gsize) _type); + g_once_init_leave (&type, (gsize) _type); } return (GType) type; -- cgit v1.2.1