Remove duplicate declarations

This causes 'redefinition of typedef ...' errors on GCC 4.5.3

diff --git a/gst/flv/gstflvmux.h b/gst/flv/gstflvmux.h
index d2ad8da..2f337af 100644 (file)
--- a/gst/flv/gstflvmux.h
+++ b/gst/flv/gstflvmux.h
@@ -38,6 +38,8 @@ G_BEGIN_DECLS
 
 typedef struct _GstFlvMuxPad GstFlvMuxPad;
 typedef struct _GstFlvMuxPadClass GstFlvMuxPadClass;
+typedef struct _GstFlvMux GstFlvMux;
+typedef struct _GstFlvMuxClass GstFlvMuxClass;
 
 #define GST_TYPE_FLV_MUX \
   (gst_flv_mux_get_type ())
@@ -70,9 +72,9 @@ struct _GstFlvMuxPad
   gboolean info_changed;
 };
 
-typedef struct _GstFlvMuxPadClass {
+struct _GstFlvMuxPadClass {
   GstAggregatorPadClass parent;
-} GstFlvMuxPadClass;
+};
 
 typedef enum
 {
@@ -80,7 +82,7 @@ typedef enum
   GST_FLV_MUX_STATE_DATA
 } GstFlvMuxState;
 
-typedef struct _GstFlvMux {
+struct _GstFlvMux {
   GstAggregator   aggregator;
 
   GstPad         *srcpad;
@@ -101,11 +103,11 @@ typedef struct _GstFlvMux {
   GstClockTime last_dts;
 
   gboolean sent_header;
-} GstFlvMux;
+};
 
-typedef struct _GstFlvMuxClass {
+struct _GstFlvMuxClass {
   GstAggregatorClass parent;
-} GstFlvMuxClass;
+};
 
 GType    gst_flv_mux_pad_get_type(void);
 GType    gst_flv_mux_get_type    (void);

diff --git a/sys/v4l2/gstv4l2allocator.h b/sys/v4l2/gstv4l2allocator.h
index 9826815..2533713 100644 (file)
--- a/sys/v4l2/gstv4l2allocator.h
+++ b/sys/v4l2/gstv4l2allocator.h
@@ -50,7 +50,6 @@ typedef struct _GstV4l2MemoryGroup GstV4l2MemoryGroup;
 typedef struct _GstV4l2Memory GstV4l2Memory;
 typedef enum _GstV4l2Capabilities GstV4l2Capabilities;
 typedef enum _GstV4l2Return GstV4l2Return;
-typedef struct _GstV4l2Object GstV4l2Object;
 
 enum _GstV4l2AllocatorFlags
 {