summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2003-10-02 20:12:33 +0000
committerBrian Cameron <brian.cameron@sun.com>2003-10-02 20:12:33 +0000
commit36556c46c0d8114d3966a26ee73449d9f8f026b0 (patch)
treec116f52fe69f68eee8096d734ccc280573064dbd
parentd9e4457faa360b470a5ae418e3444fccd6c0a5de (diff)
downloadgstreamer-plugins-bad-36556c46c0d8114d3966a26ee73449d9f8f026b0.tar.gz
Corrected macro in medi-info-priv.h so that it follows ISO standards, and removed broken return from void function in...
Original commit message from CVS: Corrected macro in medi-info-priv.h so that it follows ISO standards, and removed broken return from void function in navigation.c
-rw-r--r--gst-libs/gst/media-info/media-info-priv.h9
-rw-r--r--gst-libs/gst/navigation/navigation.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h
index 3e7a598c3..0a7aa5009 100644
--- a/gst-libs/gst/media-info/media-info-priv.h
+++ b/gst-libs/gst/media-info/media-info-priv.h
@@ -32,9 +32,18 @@ static gboolean _gmi_debug = TRUE;
static gboolean _gmi_debug = FALSE;
#endif
+#ifdef G_HAVE_ISO_VARARGS
+
+#define GMI_DEBUG(...) \
+ { if (_gmi_debug) { g_print ( __VA_ARGS__ ); }}
+
+#elif defined(G_HAVE_GNUC_VARARGS)
+
#define GMI_DEBUG(format, args...) \
{ if (_gmi_debug) { g_print ( format , ## args ); }}
+#endif
+
/* state machine enum; FIXME: can we move this to priv.c ? */
typedef enum
diff --git a/gst-libs/gst/navigation/navigation.c b/gst-libs/gst/navigation/navigation.c
index 4ae996d89..c503afe14 100644
--- a/gst-libs/gst/navigation/navigation.c
+++ b/gst-libs/gst/navigation/navigation.c
@@ -68,7 +68,7 @@ gst_navigation_send_event (GstNavigation *navigation, GstCaps *caps)
GstNavigationClass *klass = GST_NAVIGATION_GET_CLASS (navigation);
if (klass->send_event) {
- return klass->send_event (navigation, caps);
+ klass->send_event (navigation, caps);
}
}