summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Keller <skeller@gnome.org>2023-05-03 00:28:29 +0200
committerMarge Bot <marge-bot@gnome.org>2023-05-04 12:11:26 +0000
commit5b26db8ae85bf86bdf586cc1d698ba7e59161494 (patch)
treed4cb28c6dd790674d8bda05dd413d5d268295d7b
parent07184e099c0811ba499479049cb5c47e7f585d19 (diff)
downloadmutter-5b26db8ae85bf86bdf586cc1d698ba7e59161494.tar.gz
clutter: Remove struct paddings
Due to clutter being a private library we don't need worry about ABI compatibility. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2986>
-rw-r--r--clutter/clutter/clutter-actor.c4
-rw-r--r--clutter/clutter/clutter-actor.h4
-rw-r--r--clutter/clutter/clutter-layout-manager.h2
-rw-r--r--clutter/clutter/clutter-layout-meta.h5
4 files changed, 2 insertions, 13 deletions
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index dca119331..4ee4b10ac 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -16665,9 +16665,7 @@ typedef struct _RealActorIter
{
ClutterActor *root; /* dummy1 */
ClutterActor *current; /* dummy2 */
- gpointer padding_1; /* dummy3 */
- gint age; /* dummy4 */
- gpointer padding_2; /* dummy5 */
+ gint age; /* dummy3 */
} RealActorIter;
/**
diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
index 98deaa4ed..2f71cca0d 100644
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -308,9 +308,7 @@ struct _ClutterActorIter
/*< private >*/
gpointer CLUTTER_PRIVATE_FIELD (dummy1);
gpointer CLUTTER_PRIVATE_FIELD (dummy2);
- gpointer CLUTTER_PRIVATE_FIELD (dummy3);
- gint CLUTTER_PRIVATE_FIELD (dummy4);
- gpointer CLUTTER_PRIVATE_FIELD (dummy5);
+ gint CLUTTER_PRIVATE_FIELD (dummy3);
};
CLUTTER_EXPORT
diff --git a/clutter/clutter/clutter-layout-manager.h b/clutter/clutter/clutter-layout-manager.h
index 87a8937ee..29329f25a 100644
--- a/clutter/clutter/clutter-layout-manager.h
+++ b/clutter/clutter/clutter-layout-manager.h
@@ -46,8 +46,6 @@ struct _ClutterLayoutManager
{
/*< private >*/
GInitiallyUnowned parent_instance;
-
- gpointer CLUTTER_PRIVATE_FIELD (dummy);
};
/**
diff --git a/clutter/clutter/clutter-layout-meta.h b/clutter/clutter/clutter-layout-meta.h
index ee6a6fb95..d8a5d5f23 100644
--- a/clutter/clutter/clutter-layout-meta.h
+++ b/clutter/clutter/clutter-layout-meta.h
@@ -53,11 +53,6 @@ struct _ClutterLayoutMeta
/*< public >*/
ClutterLayoutManager *manager;
-
- /*< private >*/
- /* padding */
- gint32 dummy0;
- gpointer dummy1;
};
/**