luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 22:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadowing of G_VALUE_COLLECT variables in G_VALUE_COLLECT_INIT

Browse Source 
Closes: bgo#608602
This commit is contained in:
Philip Withnall 2010-01-31 16:15:32 +00:00
parent 6d52d34dff
commit aa67c725e1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gobject/gvaluecollector.h
View File

@ -85,14 +85,14 @@ union _GTypeCValue
*/ */
#define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error) \ #define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error) \
G_STMT_START { \ G_STMT_START { \
GValue *_value = (value); \ GValue *__value = (value); \
guint _flags = (flags); \ guint _flags = (flags); \
GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \ GTypeValueTable *__vtable = g_type_value_table_peek (_value_type); \
gchar *_collect_format = _vtable->collect_format; \ gchar *_collect_format = __vtable->collect_format; \
GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \ GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \
guint _n_values = 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) \ while (*_collect_format) \
{ \ { \
GTypeCValue *_cvalue = _cvalues + _n_values++; \ GTypeCValue *_cvalue = _cvalues + _n_values++; \
@ -118,7 +118,7 @@ G_STMT_START { \
g_assert_not_reached (); \ g_assert_not_reached (); \
} \ } \
} \ } \
*(__error) = _vtable->collect_value (_value, \ *(__error) = __vtable->collect_value (__value, \
_n_values, \ _n_values, \
_cvalues, \ _cvalues, \
_flags); \ _flags); \