diff options
| author | David Schleef <ds@schleef.org> | 2009-02-28 11:15:29 -0800 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2009-02-28 11:15:29 -0800 |
| commit | a29773e4cc07ad3ed8436629e1bc5fba467268f2 (patch) | |
| tree | 49f0293d6a9bfe8b0059213768a3dc2d8c7cabd0 | |
| parent | 4292c66ccd9747281069d01840bd57ef501d8a56 (diff) | |
Bump glib requirement to 2.14
Also remove code conditional on < 2.14.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst/gstutils.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6728a3c0c7..6d5e0ce660 100644 --- a/configure.ac +++ b/configure.ac @@ -472,7 +472,7 @@ LIBS="$save_libs" dnl *** checks for dependency libraries *** dnl GLib -GLIB_REQ=2.12 +GLIB_REQ=2.14 AG_GST_GLIB_CHECK([$GLIB_REQ]) diff --git a/gst/gstutils.h b/gst/gstutils.h index a9d891c54c..9a434bf69e 100644 --- a/gst/gstutils.h +++ b/gst/gstutils.h @@ -92,14 +92,8 @@ GType gst_type_register_static_full (GType parent_type, /* Macros for defining classes. Ideas taken from Bonobo, which took theirs 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_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: |