projects
/
gnome.gobject-introspection
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c48b7ae
)
Fix bad merge introduced in commit b006d50
author
Colin Walters
<walters@verbum.org>
Thu, 19 Feb 2009 14:56:20 +0000
(09:56 -0500)
committer
Colin Walters
<walters@verbum.org>
Thu, 19 Feb 2009 14:56:20 +0000
(09:56 -0500)
girepository/girnode.c
patch
|
blob
|
history
diff --git
a/girepository/girnode.c
b/girepository/girnode.c
index
6d71ebe
..
744f908
100644
(file)
--- 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;