From: Bastien Nocera <hadess@hadess.net>
Date: Sat, 2 Apr 2011 13:51:18 +0000 (+0100)
Subject: utils: Avoid using "type" as name for a variable and a macro argument in GST_BOILERPLATE
X-Git-Tag: RELEASE-0.10.33~253
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08e189badbeffcce1ee9addbdee7023b676ce6c7;p=platform%2Fupstream%2Fgstreamer.git

utils: Avoid using "type" as name for a variable and a macro argument in GST_BOILERPLATE

This caused "re-declaration" problems.
./clutter-gst-video-sink.c: In function ‘clutter_gst_video_sink_init_interfaces’:
./clutter-gst-video-sink.c:231:1: warning: declaration of ‘ClutterGstVideoSink’ shadows a global declaration [-Wshadow]
./clutter-gst-video-sink.h:64:44: warning: shadowed declaration is here [-Wshadow]

https://bugzilla.gnome.org/show_bug.cgi?id=646531
---

diff --git a/gst/gstutils.h b/gst/gstutils.h
index dd93658..d1a9fed 100644
--- a/gst/gstutils.h
+++ b/gst/gstutils.h
@@ -216,7 +216,7 @@ type_as_function ## _implements_interface_init (GstImplementsInterfaceClass *kla
 }                                                                       \
                                                                         \
 static void                                                             \
-type_as_function ## _init_interfaces (GType type)                       \
+type_as_function ## _init_interfaces (GType type_var)                   \
 {                                                                       \
   static const GInterfaceInfo implements_iface_info = {                 \
     (GInterfaceInitFunc) type_as_function ## _implements_interface_init,\
@@ -229,9 +229,9 @@ type_as_function ## _init_interfaces (GType type)                       \
     NULL,                                                               \
   };                                                                    \
                                                                         \
-  g_type_add_interface_static (type, GST_TYPE_IMPLEMENTS_INTERFACE,     \
+  g_type_add_interface_static (type_var, GST_TYPE_IMPLEMENTS_INTERFACE, \
       &implements_iface_info);                                          \
-  g_type_add_interface_static (type, interface_type_as_macro,		\
+  g_type_add_interface_static (type_var, interface_type_as_macro,	\
       &iface_info);							\
 }                                                                       \
                                                                         \