From 33f73b400d6f6e184412bfaad65b503fa9e38d62 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 30 Oct 2015 01:16:02 +1100 Subject: [PATCH] glbufferpool: move typedef's into the forward decleration file Otherwise, for example, clang will warn about typedef redefinitions being a C11 feature. --- gst-libs/gst/gl/gstgl_fwd.h | 4 ++++ gst-libs/gst/gl/gstglbufferpool.h | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/gl/gstgl_fwd.h b/gst-libs/gst/gl/gstgl_fwd.h index f76e6724f7..652bb32348 100644 --- a/gst-libs/gst/gl/gstgl_fwd.h +++ b/gst-libs/gst/gl/gstgl_fwd.h @@ -67,6 +67,10 @@ typedef struct _GstGLUploadMeta GstGLUploadMeta; typedef struct _GstGLUploadMetaClass GstGLUploadMetaClass; typedef struct _GstGLUploadMetaPrivate GstGLUploadMetaPrivate; +typedef struct _GstGLBufferPool GstGLBufferPool; +typedef struct _GstGLBufferPoolClass GstGLBufferPoolClass; +typedef struct _GstGLBufferPoolPrivate GstGLBufferPoolPrivate; + typedef struct _GstGLColorConvert GstGLColorConvert; typedef struct _GstGLColorConvertClass GstGLColorConvertClass; typedef struct _GstGLColorConvertPrivate GstGLColorConvertPrivate; diff --git a/gst-libs/gst/gl/gstglbufferpool.h b/gst-libs/gst/gl/gstglbufferpool.h index cea1175133..cfdb23ce54 100644 --- a/gst-libs/gst/gl/gstglbufferpool.h +++ b/gst-libs/gst/gl/gstglbufferpool.h @@ -25,14 +25,10 @@ #include #include -#include +#include G_BEGIN_DECLS -typedef struct _GstGLBufferPool GstGLBufferPool; -typedef struct _GstGLBufferPoolClass GstGLBufferPoolClass; -typedef struct _GstGLBufferPoolPrivate GstGLBufferPoolPrivate; - /* buffer pool functions */ GType gst_gl_buffer_pool_get_type (void); #define GST_TYPE_GL_BUFFER_POOL (gst_gl_buffer_pool_get_type())