for better greppability at the time we bump GLib version requirements.
g_warning ("Don't use G_TYPE_DATE, use GST_TYPE_DATE instead\n");
type = GST_TYPE_DATE;
}
-#ifndef G_VALUE_COLLECT_INIT
+#if GLIB_CHECK_VERSION(2,23,3)
+ G_VALUE_COLLECT_INIT (&value, type, varargs, 0, &err);
+#else
g_value_init (&value, type);
G_VALUE_COLLECT (&value, varargs, 0, &err);
-#else
- G_VALUE_COLLECT_INIT (&value, type, varargs, 0, &err);
#endif
if (G_UNLIKELY (err)) {
g_critical ("%s", err);
if (!gst_child_proxy_lookup (object, name, &target, &pspec))
goto not_found;
-#ifndef G_VALUE_COLLECT_INIT
- g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
- G_VALUE_COLLECT (&value, var_args, G_VALUE_NOCOPY_CONTENTS, &error);
-#else
+#if GLIB_CHECK_VERSION(2,23,3)
G_VALUE_COLLECT_INIT (&value, pspec->value_type, var_args,
G_VALUE_NOCOPY_CONTENTS, &error);
+#else
+ g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+ G_VALUE_COLLECT (&value, var_args, G_VALUE_NOCOPY_CONTENTS, &error);
#endif
if (error)
goto cant_copy;
g_warning ("Don't use G_TYPE_DATE, use GST_TYPE_DATE instead\n");
type = GST_TYPE_DATE;
}
-#ifndef G_VALUE_COLLECT_INIT
+#if GLIB_CHECK_VERSION(2,23,3)
+ G_VALUE_COLLECT_INIT (&field.value, type, varargs, 0, &err);
+#else
g_value_init (&field.value, type);
G_VALUE_COLLECT (&field.value, varargs, 0, &err);
-#else
- G_VALUE_COLLECT_INIT (&field.value, type, varargs, 0, &err);
#endif
if (G_UNLIKELY (err)) {
g_critical ("%s", err);
g_warning ("unknown tag '%s'", tag);
return;
}
-#ifndef G_VALUE_COLLECT_INIT
+#if GLIB_CHECK_VERSION(2,23,3)
+ G_VALUE_COLLECT_INIT (&value, info->type, var_args, 0, &error);
+#else
g_value_init (&value, info->type);
G_VALUE_COLLECT (&value, var_args, 0, &error);
-#else
- G_VALUE_COLLECT_INIT (&value, info->type, var_args, 0, &error);
#endif
if (error) {
g_warning ("%s: %s", G_STRLOC, error);