From d4fdc9b5d1453424e62fede49a4ee7e590cd931a Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sat, 22 Sep 2012 18:51:46 +0200 Subject: [PATCH] Reset ABI for 1.0 and ensure that extensible baseclasses are extensible enough --- ges/ges-formatter.h | 2 +- ges/ges-timeline-object.h | 4 ++-- ges/ges-track-object.h | 4 ++-- ges/ges-types.h | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ges/ges-formatter.h b/ges/ges-formatter.h index df76e14..e57b28d 100644 --- a/ges/ges-formatter.h +++ b/ges/ges-formatter.h @@ -59,7 +59,7 @@ struct _GESFormatter { GESTimeline *timeline; /* Padding for API extension */ - gpointer _ges_reserved[GES_PADDING - 1]; + gpointer _ges_reserved[GES_PADDING]; }; typedef gboolean (*GESFormatterCanLoadURIMethod) (const gchar * uri, GError **error); diff --git a/ges/ges-timeline-object.h b/ges/ges-timeline-object.h index 5c752cd..89dede4 100644 --- a/ges/ges-timeline-object.h +++ b/ges/ges-timeline-object.h @@ -172,7 +172,7 @@ struct _GESTimelineObject { guint64 fullduration; /* Full usable duration of the object (-1: no duration) */ /* Padding for API extension */ - gpointer _ges_reserved[GES_PADDING]; + gpointer _ges_reserved[GES_PADDING_LARGE]; }; /** @@ -216,7 +216,7 @@ struct _GESTimelineObjectClass { /*< private >*/ /* Padding for API extension */ - gpointer _ges_reserved[GES_PADDING - 4]; + gpointer _ges_reserved[GES_PADDING_LARGE]; }; GType ges_timeline_object_get_type (void); diff --git a/ges/ges-track-object.h b/ges/ges-track-object.h index 307a9a9..60b25a7 100644 --- a/ges/ges-track-object.h +++ b/ges/ges-track-object.h @@ -90,7 +90,7 @@ struct _GESTrackObject { GESTrackObjectPrivate *priv; /* Padding for API extension */ - gpointer _ges_reserved[GES_PADDING]; + gpointer _ges_reserved[GES_PADDING_LARGE]; }; /** @@ -141,7 +141,7 @@ struct _GESTrackObjectClass { guint *n_properties); /*< private >*/ /* Padding for API extension */ - gpointer _ges_reserved[GES_PADDING - 2]; + gpointer _ges_reserved[GES_PADDING_LARGE]; }; GType ges_track_object_get_type (void); diff --git a/ges/ges-types.h b/ges/ges-types.h index 455c457..a724cbb 100644 --- a/ges/ges-types.h +++ b/ges/ges-types.h @@ -22,7 +22,10 @@ #define __GES_TYPES_H__ /* Padding */ -#define GES_PADDING 4 +#define GES_PADDING 4 + +/* padding for very extensible base classes */ +#define GES_PADDING_LARGE 20 /* Type definitions */ -- 2.7.4