From 865ac8e510de2b0fdd80e3324049c0c9e628e74a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 19 Feb 2009 09:56:20 -0500 Subject: [PATCH] Fix bad merge introduced in commit b006d50 --- girnode.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/girnode.c b/girnode.c index 6d71ebebe..744f908a1 100644 --- a/girnode.c +++ b/girnode.c @@ -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;