Commit f75fad6a authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

Remove some compatibility stuff for GLib < 2.14

parent 26f9f721
......@@ -32,11 +32,6 @@
G_BEGIN_DECLS
/* FIXME: Remove this once we depend on GLib >= 2.13.0 */
#ifndef G_PARAM_STATIC_STRINGS
#define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
#endif
G_END_DECLS
#endif /* __GST_GLIB_COMPAT_H__ */
......@@ -92,9 +92,6 @@ GType gst_type_register_static_full (GType parent_type,
/* Macros for defining classes. Ideas taken from Bonobo, which took theirs
from Nautilus and GOB. */
#define __gst_once_init_enter(val) (g_once_init_enter (val))
#define __gst_once_init_leave(val,newval) (g_once_init_leave (val, newval))
/**
* GST_BOILERPLATE_FULL:
* @type: the name of the type struct
......@@ -139,7 +136,7 @@ type_as_function ## _get_type (void) \
* system and whether the compiler is c++ or not. The g_once_init_* \
* functions always take a gsize * though ... */ \
static volatile gsize gonce_data = 0; \
if (__gst_once_init_enter (&gonce_data)) { \
if (g_once_init_enter (&gonce_data)) { \
GType _type; \
_type = gst_type_register_static_full (parent_type_macro, \
g_intern_static_string (#type), \
......@@ -155,7 +152,7 @@ type_as_function ## _get_type (void) \
NULL, \
(GTypeFlags) 0); \
additional_initializations (_type); \
__gst_once_init_leave (&gonce_data, (gsize) _type); \
g_once_init_leave (&gonce_data, (gsize) _type); \
} \
return (GType) gonce_data; \
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment