From 5fa05950464a0132769da54fceb508a32f8144a6 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Tue, 17 Feb 2015 23:50:51 +0000 Subject: [PATCH] glmixer: fix some compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit i686-apple-darwin11-llvm-gcc-4.2 gstglmixer.h:43: error: redefinition of typedef ‘GstGLMixer’ gstglmixerpad.h:32: error: previous declaration of ‘GstGLMixer’ was here gstglmixer.h:46: error: redefinition of typedef ‘GstGLMixerFrameData’ gstglmixerpad.h:33: error: previous declaration of ‘GstGLMixerFrameData’ was here --- ext/gl/gstglmixerpad.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/gl/gstglmixerpad.h b/ext/gl/gstglmixerpad.h index a57eb4db5d..a180c762d5 100644 --- a/ext/gl/gstglmixerpad.h +++ b/ext/gl/gstglmixerpad.h @@ -29,8 +29,8 @@ G_BEGIN_DECLS -typedef struct _GstGLMixer GstGLMixer; -typedef struct _GstGLMixerFrameData GstGLMixerFrameData; +struct _GstGLMixer; +struct _GstGLMixerFrameData; #define GST_TYPE_GL_MIXER_PAD (gst_gl_mixer_pad_get_type()) #define GST_GL_MIXER_PAD(obj) \ @@ -62,7 +62,7 @@ struct _GstGLMixerPadClass { GstVideoAggregatorPadClass parent_class; - GstBuffer * (*upload_buffer) (GstGLMixer * mix, GstGLMixerFrameData * frame, GstBuffer * buffer); + GstBuffer * (*upload_buffer) (struct _GstGLMixer * mix, struct _GstGLMixerFrameData * frame, GstBuffer * buffer); }; GType gst_gl_mixer_pad_get_type (void);