From e35614266c8a6a71c1b36dcb6f08cf9d337af8b6 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 19 Dec 2004 16:46:21 +0000 Subject: [PATCH] sys/: g_assert() can be a macro, don't use #ifdef inside it. Original commit message from CVS: * sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported): * sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported): g_assert() can be a macro, don't use #ifdef inside it. --- ChangeLog | 6 ++++++ sys/v4l/gstv4lelement.c | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index db92de2..5aabe67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-19 Ronald S. Bultje + + * sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported): + * sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported): + g_assert() can be a macro, don't use #ifdef inside it. + 2004-12-19 Edward Hervey Reviewed by: Ronald S. Bultje diff --git a/sys/v4l/gstv4lelement.c b/sys/v4l/gstv4lelement.c index 042222a..48a25ca 100644 --- a/sys/v4l/gstv4lelement.c +++ b/sys/v4l/gstv4lelement.c @@ -81,11 +81,13 @@ static guint gst_v4lelement_signals[LAST_SIGNAL] = { 0 }; static gboolean gst_v4l_iface_supported (GstImplementsInterface * iface, GType iface_type) { - g_assert (iface_type == GST_TYPE_TUNER || #ifdef HAVE_XVIDEO - iface_type == GST_TYPE_X_OVERLAY || -#endif + g_assert (iface_type == GST_TYPE_TUNER || + iface_type == GST_TYPE_X_OVERLAY || iface_type == GST_TYPE_COLOR_BALANCE); +#else + g_assert (iface_type == GST_TYPE_TUNER || iface_type == GST_TYPE_COLOR_BALANCE); +#endif return TRUE; } -- 2.7.4