summaryrefslogtreecommitdiff
path: root/json-glib/json-types.h
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2015-11-06 11:23:45 +0100
committerPhilip Withnall <philip.withnall@collabora.co.uk>2015-11-06 11:25:30 +0100
commit3e0985cbb3399af8bece24a2933b9045edcc7a74 (patch)
tree72dce58ac1946c42f69a07d300bd2145c9ce0109 /json-glib/json-types.h
parentc0607bee11fae7963d64de6556d2dea84310ca63 (diff)
downloadjson-glib-3e0985cbb3399af8bece24a2933b9045edcc7a74.tar.gz
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
Diffstat (limited to 'json-glib/json-types.h')
-rw-r--r--json-glib/json-types.h6
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