GVariantIter: expand the size of the dummy struct

Will allow for some nice tricks in the future.

diff --git a/glib/gvariant.c b/glib/gvariant.c
index d484ee2b57e32f6e0013451b731e30211796eee2..1cacb63963f04568c88c30b1ec1062e837f484a8 100644 (file)
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -1993,7 +1993,7 @@ gsize
 g_variant_iter_init (GVariantIter *iter,
                      GVariant     *value)
 {
-  g_assert (sizeof (GVariantIter) == sizeof (struct stack_iter));
+  g_assert (sizeof (struct stack_iter) <= sizeof (GVariantIter));
 
   GVSI(iter)->magic = GVSI_MAGIC;
   GVSI(iter)->value = value;
@@ -2371,7 +2371,7 @@ g_variant_builder_init (GVariantBuilder    *builder,
   g_return_if_fail (type != NULL);
   g_return_if_fail (g_variant_type_is_container (type));
 
-  g_assert (sizeof (struct stack_builder) < sizeof (GVariantBuilder));
+  g_assert (sizeof (struct stack_builder) <= sizeof (GVariantBuilder));
   memset (builder, 0, sizeof (GVariantBuilder));
 
   GVSB(builder)->type = g_variant_type_copy (type);

diff --git a/glib/gvariant.h b/glib/gvariant.h
index a073b2b2cae3d4d91cf85e9bba4ac907ad1ba6c4..abf81020a843b0a817db16efcafb6bdf75a0ad3b 100644 (file)
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -142,7 +142,7 @@ gboolean                        g_variant_equal                         (gconstp
 typedef struct _GVariantIter GVariantIter;
 struct _GVariantIter {
   /*< private >*/
-  gsize x[8];
+  gsize x[16];
 };
 
 GVariantIter *                  g_variant_iter_new                      (GVariant             *value);