diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2010-01-31 16:15:32 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2010-01-31 17:45:54 +0000 |
| commit | aa67c725e1bde15c900b65c1971771ec084cef20 (patch) | |
| tree | 279c4d487ba23960fa5994a0d9a19a0cdba8bf94 /gobject/gvaluecollector.h | |
| parent | 6d52d34dff51676bdfa42d09c26c683304275c39 (diff) | |
| download | glib-aa67c725e1bde15c900b65c1971771ec084cef20.tar.gz | |
Fix shadowing of G_VALUE_COLLECT variables in G_VALUE_COLLECT_INIT
Closes: bgo#608602
Diffstat (limited to 'gobject/gvaluecollector.h')
| -rw-r--r-- | gobject/gvaluecollector.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h index d7f66e22d..2bcfe3c9a 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); \ |