diff options
| author | Maciej Wolny <maciej.wolny@codethink.co.uk> | 2018-11-19 15:09:25 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-05-01 17:04:13 +0100 |
| commit | 49dae4ec57a6fa30d93a8ecf9c73018c9d03946c (patch) | |
| tree | 81292ea88fea39c1730dadd0bd20e06f3be6c865 | |
| parent | 9d917d5b0d35a7e563b8d4ab6f6b1b44e3906628 (diff) | |
| download | gstreamer-plugins-base-49dae4ec57a6fa30d93a8ecf9c73018c9d03946c.tar.gz | |
gst-gl: Remove duplicate declarations
This causes 'redefinition of typedef ...' errors on GCC 4.5.3
| -rw-r--r-- | gst-libs/gst/gl/gbm/gstglwindow_gbm_egl.h | 3 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstgldebug.h | 2 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstglfuncs.h | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/gst-libs/gst/gl/gbm/gstglwindow_gbm_egl.h b/gst-libs/gst/gl/gbm/gstglwindow_gbm_egl.h index 3d132a24b..e89af2f53 100644 --- a/gst-libs/gst/gl/gbm/gstglwindow_gbm_egl.h +++ b/gst-libs/gst/gl/gbm/gstglwindow_gbm_egl.h @@ -24,6 +24,7 @@ #include <gbm.h> #include <gst/gl/gl.h> #include <gst/gl/egl/gstegl.h> +#include <gst/gl/gbm/gstgldisplay_gbm.h> G_BEGIN_DECLS @@ -37,8 +38,6 @@ G_BEGIN_DECLS typedef struct _GstGLWindowGBMEGL GstGLWindowGBMEGL; typedef struct _GstGLWindowGBMEGLClass GstGLWindowGBMEGLClass; -typedef struct _GstGLDisplayGBM GstGLDisplayGBM; - struct _GstGLWindowGBMEGL { /*< private >*/ GstGLWindow parent; diff --git a/gst-libs/gst/gl/gstgldebug.h b/gst-libs/gst/gl/gstgldebug.h index 99e6ce225..2daff7a64 100644 --- a/gst-libs/gst/gl/gstgldebug.h +++ b/gst-libs/gst/gl/gstgldebug.h @@ -25,8 +25,6 @@ G_BEGIN_DECLS -typedef struct _GstGLAsyncDebug GstGLAsyncDebug; - typedef gchar * (*GstGLAsyncDebugLogGetMessage) (gpointer user_data); /** diff --git a/gst-libs/gst/gl/gstglfuncs.h b/gst-libs/gst/gl/gstglfuncs.h index 805abcf3d..e3bf8746d 100644 --- a/gst-libs/gst/gl/gstglfuncs.h +++ b/gst-libs/gst/gl/gstglfuncs.h @@ -93,11 +93,11 @@ G_BEGIN_DECLS ret (GSTGLAPI *name) args; #define GST_GL_EXT_END() -typedef struct _GstGLFuncs +struct _GstGLFuncs { #include <gst/gl/glprototypes/all_functions.h> gpointer padding[GST_PADDING_LARGE*6]; -} GstGLFuncs; +}; #undef GST_GL_EXT_BEGIN #undef GST_GL_EXT_FUNCTION |