diff options
| author | Colin Walters <walters@verbum.org> | 2009-02-19 14:56:20 (GMT) |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-02-19 14:56:20 (GMT) |
| commit | 8cdaea8b831797c69b19559faaf525b237d36258 (patch) | |
| tree | 2184a3347b735fbb424857972f9b05a78022f3c1 | |
| parent | c48b7ae03510c83b984ba86b60861c1f45d60046 (diff) | |
Fix bad merge introduced in commit b006d50
| -rw-r--r-- | girepository/girnode.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/girepository/girnode.c b/girepository/girnode.c index 6d71ebe..744f908 100644 --- a/girepository/girnode.c +++ b/girepository/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; |