From b40c2f81145510c0e34e8010da0365f6e80b6bdb Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Sun, 28 Mar 2010 15:10:20 +0300 Subject: [PATCH] build: fix redeclaration erors when building with --gst-disable-gst-debug Give dummy symbols a uniqe name. --- gst/gstinfo.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/gstinfo.h b/gst/gstinfo.h index 77c2f49..216d60c 100644 --- a/gst/gstinfo.h +++ b/gst/gstinfo.h @@ -1177,12 +1177,12 @@ GST_FIXME (const char *format, ...) #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) void _gst_dummy_declaration (void) -#define GST_DEBUG_CATEGORY_EXTERN(var) void _gst_dummy_declaration (void) +#define GST_DEBUG_CATEGORY(var) void _gst_debug_dummy_##var (void) +#define GST_DEBUG_CATEGORY_EXTERN(var) void _gst_debug_dummy_extern_##var (void) #if !defined(G_HAVE_GNUC_VARARGS) && !defined(G_HAVE_ISO_VARARGS) -#define GST_DEBUG_CATEGORY_STATIC(var) static GstDebugCategory *var = NULL +#define GST_DEBUG_CATEGORY_STATIC(var) static GstDebugCategory *_gst_debug_dummy_##var = NULL #else -#define GST_DEBUG_CATEGORY_STATIC(var) void _gst_dummy_declaration (void) +#define GST_DEBUG_CATEGORY_STATIC(var) void _gst_debug_dummy_##var (void) #endif #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 -- 2.7.4