From cf0e4c33fa8a7efdc62d52cad0d7dc9135dccdf8 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 2 Feb 2010 10:41:00 +0000 Subject: [PATCH] Don't use a compiler keyword as a variable name Appease the MS C++ compiler by using _val instead of __value as a variable name in G_VALUE_COLLECT_INIT. Problem found by Haakon Sporsheim . Re-closes: bgo#608602 --- gobject/gvaluecollector.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h index 2bcfe3c9a..163e7c780 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 *_val = (value); \ guint _flags = (flags); \ - GTypeValueTable *__vtable = g_type_value_table_peek (_value_type); \ - gchar *_collect_format = __vtable->collect_format; \ + GTypeValueTable *_vtab = g_type_value_table_peek (_value_type); \ + gchar *_collect_format = _vtab->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 */ \ + _val->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) = _vtab->collect_value (_val, \ _n_values, \ _cvalues, \ _flags); \ -- 2.11.4.GIT