[farsight2/master] Move the padding to the end of the structure (where it should be)

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:18:51 PST 2008


---
 gst-libs/gst/farsight/fs-base-conference.h |    2 +-
 gst-libs/gst/farsight/fs-participant.h     |    3 ++-
 gst-libs/gst/farsight/fs-session.h         |    3 ++-
 gst-libs/gst/farsight/fs-stream.h          |    3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-base-conference.h b/gst-libs/gst/farsight/fs-base-conference.h
index 1665af4..be1ddd3 100644
--- a/gst-libs/gst/farsight/fs-base-conference.h
+++ b/gst-libs/gst/farsight/fs-base-conference.h
@@ -57,9 +57,9 @@ typedef struct _FsBaseConferencePrivate FsBaseConferencePrivate;
 struct _FsBaseConference
 {
   GstElement parent;
+  FsBaseConferencePrivate *priv;
 
   /*< private >*/
-  FsBaseConferencePrivate *priv;
 
   gpointer _padding[8];
 };
diff --git a/gst-libs/gst/farsight/fs-participant.h b/gst-libs/gst/farsight/fs-participant.h
index a1f0411..28b68b0 100644
--- a/gst-libs/gst/farsight/fs-participant.h
+++ b/gst-libs/gst/farsight/fs-participant.h
@@ -66,10 +66,11 @@ struct _FsParticipantClass
 struct _FsParticipant
 {
   GObject parent;
+  FsParticipantPrivate *priv;
 
   /*< private >*/
+
   gpointer _padding[8];
-  FsParticipantPrivate *priv;
 };
 
 GType fs_participant_get_type (void);
diff --git a/gst-libs/gst/farsight/fs-session.h b/gst-libs/gst/farsight/fs-session.h
index b22b2d8..eb4de2d 100644
--- a/gst-libs/gst/farsight/fs-session.h
+++ b/gst-libs/gst/farsight/fs-session.h
@@ -126,10 +126,11 @@ struct _FsSessionClass
 struct _FsSession
 {
   GObject parent;
+  FsSessionPrivate *priv;
 
   /*< private >*/
+
   gpointer _padding[8];
-  FsSessionPrivate *priv;
 };
 
 GType fs_session_get_type (void);
diff --git a/gst-libs/gst/farsight/fs-stream.h b/gst-libs/gst/farsight/fs-stream.h
index 325bbb0..d32f69c 100644
--- a/gst-libs/gst/farsight/fs-stream.h
+++ b/gst-libs/gst/farsight/fs-stream.h
@@ -96,10 +96,11 @@ struct _FsStreamClass
 struct _FsStream
 {
   GObject parent;
+  FsStreamPrivate *priv;
 
   /*< private >*/
+
   gpointer _padding[8];
-  FsStreamPrivate *priv;
 };
 
 GType fs_stream_get_type (void);
-- 
1.5.6.5




More information about the farsight-commits mailing list