mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-19 20:46:22 +00:00
Bump glib requirement to 2.14
Also remove code conditional on < 2.14.
This commit is contained in:
parent
4292c66ccd
commit
a29773e4cc
2 changed files with 1 additions and 7 deletions
|
@ -472,7 +472,7 @@ LIBS="$save_libs"
|
||||||
dnl *** checks for dependency libraries ***
|
dnl *** checks for dependency libraries ***
|
||||||
|
|
||||||
dnl GLib
|
dnl GLib
|
||||||
GLIB_REQ=2.12
|
GLIB_REQ=2.14
|
||||||
|
|
||||||
AG_GST_GLIB_CHECK([$GLIB_REQ])
|
AG_GST_GLIB_CHECK([$GLIB_REQ])
|
||||||
|
|
||||||
|
|
|
@ -92,14 +92,8 @@ GType gst_type_register_static_full (GType parent_type,
|
||||||
/* Macros for defining classes. Ideas taken from Bonobo, which took theirs
|
/* Macros for defining classes. Ideas taken from Bonobo, which took theirs
|
||||||
from Nautilus and GOB. */
|
from Nautilus and GOB. */
|
||||||
|
|
||||||
/* FIXME: Use g_once_init_* unconditionally 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_enter(val) (g_once_init_enter (val))
|
||||||
#define __gst_once_init_leave(val,newval) (g_once_init_leave (val, newval))
|
#define __gst_once_init_leave(val,newval) (g_once_init_leave (val, newval))
|
||||||
#else
|
|
||||||
#define __gst_once_init_enter(val) (G_UNLIKELY (*(val) == 0))
|
|
||||||
#define __gst_once_init_leave(val,newval) (*(val) = newval)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GST_BOILERPLATE_FULL:
|
* GST_BOILERPLATE_FULL:
|
||||||
|
|
Loading…
Reference in a new issue