[json-glib] types: Tweak dummy padding in JsonObjectIter



commit 3e0985cbb3399af8bece24a2933b9045edcc7a74
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Nov 6 11:23:45 2015 +0100

    types: Tweak dummy padding in JsonObjectIter
    
    Use padding which resembles the ABI structure of GHashTableIter so that
    our struct size is the same as GHashTableIter on all platforms, rather
    than just on x86_64. This fixes the static assertion failure on i386 and
    armhf.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757675

 json-glib/json-types.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/json-glib/json-types.h b/json-glib/json-types.h
index 36519c3..eea1613 100644
--- a/json-glib/json-types.h
+++ b/json-glib/json-types.h
@@ -382,8 +382,10 @@ void                  json_object_foreach_member     (JsonObject  *object,
  * Since: UNRELEASED
  */
 typedef struct {
-       /*< private >*/
-       gpointer priv[8];
+  /*< private >*/
+  gpointer priv_pointer[6];
+  int      priv_int[2];
+  gboolean priv_boolean[1];
 } JsonObjectIter;
 
 JSON_AVAILABLE_IN_1_2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]