luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge introduced in commit b006d50

Browse Source
This commit is contained in:
Colin Walters 2009-02-19 09:56:20 -05:00
parent 361de29ba0
commit 865ac8e510
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
girnode.c
View File

@ -1918,10 +1918,15 @@ g_ir_node_build_typelib (GIrNode *node,
module, modules, strings, types,
data, offset, offset2);
}
else
/* Always do the non-discriminated case */
/*
else
{
*/
/* Always do the non-discriminated case */
*offset += 32;
blob->discriminated = FALSE;
blob->discriminator_type.offset = 0;
}
*/
*offset += sizeof (UnionBlob);
blob->discriminated = FALSE;
blob->discriminator_type.offset = 0;