luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-30 19:06:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

GVariant: avoid 'ARRAY_INFO' as function name

Browse Source 
Turns out that ARRAY_INFO isn't such a great name for a function since
Windows appears to declare this symbol these days.  Use a different
name.
This commit is contained in:
Ryan Lortie
2011-09-17 17:32:42 -04:00
parent f202946146
commit 2c9c72dc8c
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
glib/gvarianttypeinfo.c
View File

@@ -254,11 +254,11 @@ g_variant_type_info_query (GVariantTypeInfo *info,
} }
/* == array == */ /* == array == */
#define ARRAY_INFO_CLASS 'a' #define GV_ARRAY_INFO_CLASS 'a'
static ArrayInfo * static ArrayInfo *
ARRAY_INFO (GVariantTypeInfo *info) GV_ARRAY_INFO (GVariantTypeInfo *info)
{ {
g_variant_type_info_check (info, ARRAY_INFO_CLASS); g_variant_type_info_check (info, GV_ARRAY_INFO_CLASS);
return (ArrayInfo *) info; return (ArrayInfo *) info;
} }
@@ -268,7 +268,7 @@ array_info_free (GVariantTypeInfo *info)
{ {
ArrayInfo *array_info; ArrayInfo *array_info;
g_assert (info->container_class == ARRAY_INFO_CLASS); g_assert (info->container_class == GV_ARRAY_INFO_CLASS);
array_info = (ArrayInfo *) info; array_info = (ArrayInfo *) info;
g_variant_type_info_unref (array_info->element); g_variant_type_info_unref (array_info->element);
@@ -281,7 +281,7 @@ array_info_new (const GVariantType *type)
ArrayInfo *info; ArrayInfo *info;
info = g_slice_new (ArrayInfo); info = g_slice_new (ArrayInfo);
info->container.info.container_class = ARRAY_INFO_CLASS; info->container.info.container_class = GV_ARRAY_INFO_CLASS;
info->element = g_variant_type_info_get (g_variant_type_element (type)); info->element = g_variant_type_info_get (g_variant_type_element (type));
info->container.info.alignment = info->element->alignment; info->container.info.alignment = info->element->alignment;
@@ -300,7 +300,7 @@ array_info_new (const GVariantType *type)
GVariantTypeInfo * GVariantTypeInfo *
g_variant_type_info_element (GVariantTypeInfo *info) g_variant_type_info_element (GVariantTypeInfo *info)
{ {
return ARRAY_INFO (info)->element; return GV_ARRAY_INFO (info)->element;
} }
/* < private > /* < private >
@@ -318,16 +318,16 @@ g_variant_type_info_query_element (GVariantTypeInfo *info,
guint *alignment, guint *alignment,
gsize *fixed_size) gsize *fixed_size)
{ {
g_variant_type_info_query (ARRAY_INFO (info)->element, g_variant_type_info_query (GV_ARRAY_INFO (info)->element,
alignment, fixed_size); alignment, fixed_size);
} }
/* == tuple == */ /* == tuple == */
#define TUPLE_INFO_CLASS 'r' #define GV_TUPLE_INFO_CLASS 'r'
static TupleInfo * static TupleInfo *
TUPLE_INFO (GVariantTypeInfo *info) GV_TUPLE_INFO (GVariantTypeInfo *info)
{ {
g_variant_type_info_check (info, TUPLE_INFO_CLASS); g_variant_type_info_check (info, GV_TUPLE_INFO_CLASS);
return (TupleInfo *) info; return (TupleInfo *) info;
} }
@@ -338,7 +338,7 @@ tuple_info_free (GVariantTypeInfo *info)
TupleInfo *tuple_info; TupleInfo *tuple_info;
gint i; gint i;
g_assert (info->container_class == TUPLE_INFO_CLASS); g_assert (info->container_class == GV_TUPLE_INFO_CLASS);
tuple_info = (TupleInfo *) info; tuple_info = (TupleInfo *) info;
for (i = 0; i < tuple_info->n_members; i++) for (i = 0; i < tuple_info->n_members; i++)
@@ -662,7 +662,7 @@ tuple_info_new (const GVariantType *type)
TupleInfo *info; TupleInfo *info;
info = g_slice_new (TupleInfo); info = g_slice_new (TupleInfo);
info->container.info.container_class = TUPLE_INFO_CLASS; info->container.info.container_class = GV_TUPLE_INFO_CLASS;
tuple_allocate_members (type, &info->members, &info->n_members); tuple_allocate_members (type, &info->members, &info->n_members);
tuple_generate_table (info); tuple_generate_table (info);
@@ -681,7 +681,7 @@ tuple_info_new (const GVariantType *type)
gsize gsize
g_variant_type_info_n_members (GVariantTypeInfo *info) g_variant_type_info_n_members (GVariantTypeInfo *info)
{ {
return TUPLE_INFO (info)->n_members; return GV_TUPLE_INFO (info)->n_members;
} }
/* < private > /* < private >
@@ -700,7 +700,7 @@ const GVariantMemberInfo *
g_variant_type_info_member_info (GVariantTypeInfo *info, g_variant_type_info_member_info (GVariantTypeInfo *info,
gsize index) gsize index)
{ {
TupleInfo *tuple_info = TUPLE_INFO (info); TupleInfo *tuple_info = GV_TUPLE_INFO (info);
if (index < tuple_info->n_members) if (index < tuple_info->n_members)
return &tuple_info->members[index]; return &tuple_info->members[index];
@@ -848,10 +848,10 @@ g_variant_type_info_unref (GVariantTypeInfo *info)
g_free (container->type_string); g_free (container->type_string);
if (info->container_class == ARRAY_INFO_CLASS) if (info->container_class == GV_ARRAY_INFO_CLASS)
array_info_free (info); array_info_free (info);
else if (info->container_class == TUPLE_INFO_CLASS) else if (info->container_class == GV_TUPLE_INFO_CLASS)
tuple_info_free (info); tuple_info_free (info);
else else