From 0eb578a008756b497544e2dd252fafa881ed02fd Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
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/v4l2/gstv4l2element.c | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db92de2f23..5aabe67379 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/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c
index f8d980c054..09953c947e 100644
--- a/sys/v4l2/gstv4l2element.c
+++ b/sys/v4l2/gstv4l2element.c
@@ -85,11 +85,13 @@ gst_v4l2_iface_supported (GstImplementsInterface * iface, GType iface_type)
 {
   GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface);
 
-  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
 
   if (v4l2element->video_fd == -1)
     return FALSE;