From: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Date: Sun, 19 Dec 2004 16:46:21 +0000 (+0000)
Subject: sys/: g_assert() can be a macro, don't use #ifdef inside it.
X-Git-Tag: BRANCH-GSTREAMER-0_8-ROOT~245
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e35614266c8a6a71c1b36dcb6f08cf9d337af8b6;p=platform%2Fupstream%2Fgst-plugins-base.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index db92de2..5aabe67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-19  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* 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  <bilboed@bilboed.com>
 
 	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
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;
 }