[gst-cvs] gstreamer: Bump glib requirement to 2.14

[David Schleef]

Module: gstreamer
Branch: master
Commit: a29773e4cc07ad3ed8436629e1bc5fba467268f2
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=a29773e4cc07ad3ed8436629e1bc5fba467268f2

Author: David Schleef <ds at schleef.org>
Date:   Sat Feb 28 11:15:29 2009 -0800

Bump glib requirement to 2.14

Also remove code conditional on < 2.14.

---

 configure.ac   |    2 +-
 gst/gstutils.h |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6728a3c..6d5e0ce 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 a9d891c..9a434bf 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: