From: David Schleef <ds@schleef.org>
Date: Mon, 20 Jul 2009 19:54:00 +0000 (-0700)
Subject: debug: use dummy code to avoid spurious semicolons
X-Git-Tag: RELEASE-0.10.25~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61203b825fd2ebdd28b7b82da41a26c58cbc5be2;p=platform%2Fupstream%2Fgstreamer.git

debug: use dummy code to avoid spurious semicolons

Fixes bug #589173.
---

diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 9d9c7fa..3985216 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -1137,37 +1137,37 @@ G_CONST_RETURN gchar *
 
 #define __gst_debug_min GST_LEVEL_NONE
 
-#define _gst_debug_init()				/* NOP */
+#define _gst_debug_init()				G_STMT_START{ }G_STMT_END
 
-#define gst_debug_set_default_threshold(level)		/* NOP */
+#define gst_debug_set_default_threshold(level)		G_STMT_START{ }G_STMT_END
 #define gst_debug_get_default_threshold()		(GST_LEVEL_NONE)
 
 #define gst_debug_level_get_name(level)				("NONE")
 #define gst_debug_message_get(message)  			("")
-#define gst_debug_add_log_function(func,data)		/* NOP */
+#define gst_debug_add_log_function(func,data)		G_STMT_START{ }G_STMT_END
 guint gst_debug_remove_log_function (GstLogFunction func);
 guint gst_debug_remove_log_function_by_data (gpointer data);
-#define gst_debug_set_active(active)			/* NOP */
+#define gst_debug_set_active(active)			G_STMT_START{ }G_STMT_END
 #define gst_debug_is_active()				(FALSE)
-#define gst_debug_set_colored(colored)			/* NOP */
+#define gst_debug_set_colored(colored)			G_STMT_START{ }G_STMT_END
 #define gst_debug_is_colored()				(FALSE)
-#define gst_debug_set_default_threshold(level)		/* NOP */
+#define gst_debug_set_default_threshold(level)		G_STMT_START{ }G_STMT_END
 #define gst_debug_get_default_threshold()		(GST_LEVEL_NONE)
-#define gst_debug_set_threshold_for_name(name,level)	/* NOP */
-#define gst_debug_unset_threshold_for_name(name)	/* NOP */
+#define gst_debug_set_threshold_for_name(name,level)	G_STMT_START{ }G_STMT_END
+#define gst_debug_unset_threshold_for_name(name)	G_STMT_START{ }G_STMT_END
 
-#define GST_DEBUG_CATEGORY(var)				/* NOP */
-#define GST_DEBUG_CATEGORY_EXTERN(var)			/* NOP */
+#define GST_DEBUG_CATEGORY(var)				void _gst_dummy_declaration (void)
+#define GST_DEBUG_CATEGORY_EXTERN(var)			void _gst_dummy_declaration (void)
 #if !defined(G_HAVE_GNUC_VARARGS) && !defined(G_HAVE_ISO_VARARGS)
 #define GST_DEBUG_CATEGORY_STATIC(var)			static GstDebugCategory *var = NULL
 #else
-#define GST_DEBUG_CATEGORY_STATIC(var)			/* NOP */
+#define GST_DEBUG_CATEGORY_STATIC(var)			void _gst_dummy_declaration (void)
 #endif
-#define GST_DEBUG_CATEGORY_INIT(var,name,color,desc)	/* NOP */
-#define GST_DEBUG_CATEGORY_GET(var,name)		/* NOP */
-#define gst_debug_category_free(category)		/* NOP */
-#define gst_debug_category_set_threshold(category,level) /* NOP */
-#define gst_debug_category_reset_threshold(category)	/* NOP */
+#define GST_DEBUG_CATEGORY_INIT(var,name,color,desc)	G_STMT_START{ }G_STMT_END
+#define GST_DEBUG_CATEGORY_GET(var,name)		G_STMT_START{ }G_STMT_END
+#define gst_debug_category_free(category)		G_STMT_START{ }G_STMT_END
+#define gst_debug_category_set_threshold(category,level) G_STMT_START{ }G_STMT_END
+#define gst_debug_category_reset_threshold(category)	G_STMT_START{ }G_STMT_END
 #define gst_debug_category_get_threshold(category)	(GST_LEVEL_NONE)
 #define gst_debug_category_get_name(cat)		("")
 #define gst_debug_category_get_color(cat)		(0)
@@ -1180,68 +1180,68 @@ guint gst_debug_remove_log_function_by_data (gpointer data);
 
 #ifdef G_HAVE_ISO_VARARGS
 
-#define GST_CAT_LEVEL_LOG(cat,level,...)		/* NOP */
-
-#define GST_CAT_ERROR_OBJECT(...)			/* NOP */
-#define GST_CAT_WARNING_OBJECT(...)			/* NOP */
-#define GST_CAT_INFO_OBJECT(...)			/* NOP */
-#define GST_CAT_DEBUG_OBJECT(...)			/* NOP */
-#define GST_CAT_LOG_OBJECT(...)				/* NOP */
-#define GST_CAT_FIXME_OBJECT(...)			/* NOP */
-
-#define GST_CAT_ERROR(...)				/* NOP */
-#define GST_CAT_WARNING(...)				/* NOP */
-#define GST_CAT_INFO(...)				/* NOP */
-#define GST_CAT_DEBUG(...)				/* NOP */
-#define GST_CAT_LOG(...)				/* NOP */
-#define GST_CAT_FIXME(...)				/* NOP */
-
-#define GST_ERROR_OBJECT(...)				/* NOP */
-#define GST_WARNING_OBJECT(...)				/* NOP */
-#define GST_INFO_OBJECT(...)				/* NOP */
-#define GST_DEBUG_OBJECT(...)				/* NOP */
-#define GST_LOG_OBJECT(...)				/* NOP */
-#define GST_FIXME_OBJECT(...)				/* NOP */
-
-#define GST_ERROR(...)					/* NOP */
-#define GST_WARNING(...)				/* NOP */
-#define GST_INFO(...)					/* NOP */
-#define GST_DEBUG(...)					/* NOP */
-#define GST_LOG(...)					/* NOP */
-#define GST_FIXME(...)					/* NOP */
+#define GST_CAT_LEVEL_LOG(cat,level,...)		G_STMT_START{ }G_STMT_END
+
+#define GST_CAT_ERROR_OBJECT(...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_WARNING_OBJECT(...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_INFO_OBJECT(...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_DEBUG_OBJECT(...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_LOG_OBJECT(...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_FIXME_OBJECT(...)			G_STMT_START{ }G_STMT_END
+
+#define GST_CAT_ERROR(...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_WARNING(...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_INFO(...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_DEBUG(...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_LOG(...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_FIXME(...)				G_STMT_START{ }G_STMT_END
+
+#define GST_ERROR_OBJECT(...)				G_STMT_START{ }G_STMT_END
+#define GST_WARNING_OBJECT(...)				G_STMT_START{ }G_STMT_END
+#define GST_INFO_OBJECT(...)				G_STMT_START{ }G_STMT_END
+#define GST_DEBUG_OBJECT(...)				G_STMT_START{ }G_STMT_END
+#define GST_LOG_OBJECT(...)				G_STMT_START{ }G_STMT_END
+#define GST_FIXME_OBJECT(...)				G_STMT_START{ }G_STMT_END
+
+#define GST_ERROR(...)					G_STMT_START{ }G_STMT_END
+#define GST_WARNING(...)				G_STMT_START{ }G_STMT_END
+#define GST_INFO(...)					G_STMT_START{ }G_STMT_END
+#define GST_DEBUG(...)					G_STMT_START{ }G_STMT_END
+#define GST_LOG(...)					G_STMT_START{ }G_STMT_END
+#define GST_FIXME(...)					G_STMT_START{ }G_STMT_END
 
 #else /* !G_HAVE_ISO_VARARGS */
 #ifdef G_HAVE_GNUC_VARARGS
 
-#define GST_CAT_LEVEL_LOG(cat,level,args...)		/* NOP */
-
-#define GST_CAT_ERROR_OBJECT(args...)			/* NOP */
-#define GST_CAT_WARNING_OBJECT(args...)			/* NOP */
-#define GST_CAT_INFO_OBJECT(args...)			/* NOP */
-#define GST_CAT_DEBUG_OBJECT(args...)			/* NOP */
-#define GST_CAT_LOG_OBJECT(args...)			/* NOP */
-#define GST_CAT_FIXME_OBJECT(args...)			/* NOP */
-
-#define GST_CAT_ERROR(args...)				/* NOP */
-#define GST_CAT_WARNING(args...)			/* NOP */
-#define GST_CAT_INFO(args...)				/* NOP */
-#define GST_CAT_DEBUG(args...)				/* NOP */
-#define GST_CAT_LOG(args...)				/* NOP */
-#define GST_CAT_FIXME(args...)				/* NOP */
-
-#define GST_ERROR_OBJECT(args...)			/* NOP */
-#define GST_WARNING_OBJECT(args...)			/* NOP */
-#define GST_INFO_OBJECT(args...)			/* NOP */
-#define GST_DEBUG_OBJECT(args...)			/* NOP */
-#define GST_LOG_OBJECT(args...)				/* NOP */
-#define GST_FIXME_OBJECT(args...)			/* NOP */
-
-#define GST_ERROR(args...)				/* NOP */
-#define GST_WARNING(args...)				/* NOP */
-#define GST_INFO(args...)				/* NOP */
-#define GST_DEBUG(args...)				/* NOP */
-#define GST_LOG(args...)				/* NOP */
-#define GST_FIXME(args...)				/* NOP */
+#define GST_CAT_LEVEL_LOG(cat,level,args...)		G_STMT_START{ }G_STMT_END
+
+#define GST_CAT_ERROR_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_WARNING_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_INFO_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_DEBUG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_LOG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_FIXME_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+
+#define GST_CAT_ERROR(args...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_WARNING(args...)			G_STMT_START{ }G_STMT_END
+#define GST_CAT_INFO(args...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_DEBUG(args...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_LOG(args...)				G_STMT_START{ }G_STMT_END
+#define GST_CAT_FIXME(args...)				G_STMT_START{ }G_STMT_END
+
+#define GST_ERROR_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_WARNING_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_INFO_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_DEBUG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+#define GST_LOG_OBJECT(args...)				G_STMT_START{ }G_STMT_END
+#define GST_FIXME_OBJECT(args...)			G_STMT_START{ }G_STMT_END
+
+#define GST_ERROR(args...)				G_STMT_START{ }G_STMT_END
+#define GST_WARNING(args...)				G_STMT_START{ }G_STMT_END
+#define GST_INFO(args...)				G_STMT_START{ }G_STMT_END
+#define GST_DEBUG(args...)				G_STMT_START{ }G_STMT_END
+#define GST_LOG(args...)				G_STMT_START{ }G_STMT_END
+#define GST_FIXME(args...)				G_STMT_START{ }G_STMT_END
 
 #else /* !G_HAVE_GNUC_VARARGS */
 static inline void
@@ -1382,10 +1382,10 @@ GST_FIXME (const char *format, ...)
 #define GST_DEBUG_FUNCPTR(ptr) (ptr)
 #define GST_DEBUG_FUNCPTR_NAME(ptr) (g_strdup_printf ("%p", ptr))
 
-#define GST_CAT_MEMDUMP_OBJECT(cat,obj,msg,data,length) /* NOP */
-#define GST_CAT_MEMDUMP(cat,msg,data,length)            /* NOP */
-#define GST_MEMDUMP_OBJECT(obj,msg,data,length)         /* NOP */
-#define GST_MEMDUMP(msg,data,length)                    /* NOP */
+#define GST_CAT_MEMDUMP_OBJECT(cat,obj,msg,data,length) G_STMT_START{ }G_STMT_END
+#define GST_CAT_MEMDUMP(cat,msg,data,length)            G_STMT_START{ }G_STMT_END
+#define GST_MEMDUMP_OBJECT(obj,msg,data,length)         G_STMT_START{ }G_STMT_END
+#define GST_MEMDUMP(msg,data,length)                    G_STMT_START{ }G_STMT_END
 
 #endif /* GST_DISABLE_GST_DEBUG */