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

Rename ALIGN to GI_ALIGN to prevent redefining this macro on some platforms

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=652625
This commit is contained in:
Jasper Lievisse Adriaanse 2011-06-21 13:44:56 +02:00
parent 98067194d6
commit a9b2dfd09a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
giroffsets.c
View File

@ -350,7 +350,7 @@ get_field_size_alignment (GIrTypelibBuild *build,
return success; return success;
} }
#define ALIGN(n, align) (((n) + (align) - 1) & ~((align) - 1)) #define GI_ALIGN(n, align) (((n) + (align) - 1) & ~((align) - 1))
static gboolean static gboolean
compute_struct_field_offsets (GIrTypelibBuild *build, compute_struct_field_offsets (GIrTypelibBuild *build,
@ -382,7 +382,7 @@ compute_struct_field_offsets (GIrTypelibBuild *build,
if (get_field_size_alignment (build, field, node, if (get_field_size_alignment (build, field, node,
&member_size, &member_alignment)) &member_size, &member_alignment))
{ {
size = ALIGN (size, member_alignment); size = GI_ALIGN (size, member_alignment);
alignment = MAX (alignment, member_alignment); alignment = MAX (alignment, member_alignment);
field->offset = size; field->offset = size;
size += member_size; size += member_size;
@ -396,14 +396,14 @@ compute_struct_field_offsets (GIrTypelibBuild *build,
} }
else if (member->type == G_IR_NODE_CALLBACK) else if (member->type == G_IR_NODE_CALLBACK)
{ {
size = ALIGN (size, ffi_type_pointer.alignment); size = GI_ALIGN (size, ffi_type_pointer.alignment);
alignment = MAX (alignment, ffi_type_pointer.alignment); alignment = MAX (alignment, ffi_type_pointer.alignment);
size += ffi_type_pointer.size; size += ffi_type_pointer.size;
} }
} }
/* Structs are tail-padded out to a multiple of their alignment */ /* Structs are tail-padded out to a multiple of their alignment */
size = ALIGN (size, alignment); size = GI_ALIGN (size, alignment);
if (!have_error) if (!have_error)
{ {
@ -459,7 +459,7 @@ compute_union_field_offsets (GIrTypelibBuild *build,
} }
/* Unions are tail-padded out to a multiple of their alignment */ /* Unions are tail-padded out to a multiple of their alignment */
size = ALIGN (size, alignment); size = GI_ALIGN (size, alignment);
if (!have_error) if (!have_error)
{ {