From: Philip Withnall <philip@tecnocode.co.uk>
Date: Sun, 31 Jan 2010 16:15:32 +0000 (+0000)
Subject: Fix shadowing of G_VALUE_COLLECT variables in G_VALUE_COLLECT_INIT
X-Git-Tag: 2.23.3~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa67c725e1bde15c900b65c1971771ec084cef20;p=platform%2Fupstream%2Fglib.git

Fix shadowing of G_VALUE_COLLECT variables in G_VALUE_COLLECT_INIT

Closes: bgo#608602
---

diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index d7f66e2..2bcfe3c 100644
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -85,14 +85,14 @@ union _GTypeCValue
  */
 #define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error)		\
 G_STMT_START {										\
-  GValue *_value = (value);								\
+  GValue *__value = (value);								\
   guint _flags = (flags);								\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  gchar *_collect_format = _vtable->collect_format;					\
+  GTypeValueTable *__vtable = g_type_value_table_peek (_value_type);			\
+  gchar *_collect_format = __vtable->collect_format;					\
   GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
   guint _n_values = 0;									\
                                                                                         \
-  _value->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
+  __value->g_type = _value_type;		/* value_meminit() from gvalue.c */	\
   while (*_collect_format)								\
     {											\
       GTypeCValue *_cvalue = _cvalues + _n_values++;					\
@@ -118,7 +118,7 @@ G_STMT_START {										\
 	  g_assert_not_reached ();							\
 	}										\
     }											\
-  *(__error) = _vtable->collect_value (_value,						\
+  *(__error) = __vtable->collect_value (__value,					\
 				       _n_values,					\
 				       _cvalues,					\
 				       _flags);						\