From dce62eff634127c5080bf8f4f39a16f05874897f Mon Sep 17 00:00:00 2001 From: Brian Cameron Date: Thu, 2 Oct 2003 20:12:33 +0000 Subject: [PATCH] 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 --- gst-libs/gst/interfaces/navigation.c | 2 +- gst-libs/gst/media-info/media-info-priv.h | 9 +++++++++ gst-libs/gst/navigation/navigation.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/interfaces/navigation.c b/gst-libs/gst/interfaces/navigation.c index 4ae996d89a..c503afe145 100644 --- a/gst-libs/gst/interfaces/navigation.c +++ b/gst-libs/gst/interfaces/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); } } diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h index 3e7a598c39..0a7aa5009d 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 4ae996d89a..c503afe145 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); } }