Commit 49dae4ec authored by Maciej Wolny's avatar Maciej Wolny Committed by Tim-Philipp Müller

gst-gl: Remove duplicate declarations

This causes 'redefinition of typedef ...' errors on GCC 4.5.3
parent 9d917d5b
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <gbm.h> #include <gbm.h>
#include <gst/gl/gl.h> #include <gst/gl/gl.h>
#include <gst/gl/egl/gstegl.h> #include <gst/gl/egl/gstegl.h>
#include <gst/gl/gbm/gstgldisplay_gbm.h>
G_BEGIN_DECLS G_BEGIN_DECLS
...@@ -37,8 +38,6 @@ G_BEGIN_DECLS ...@@ -37,8 +38,6 @@ G_BEGIN_DECLS
typedef struct _GstGLWindowGBMEGL GstGLWindowGBMEGL; typedef struct _GstGLWindowGBMEGL GstGLWindowGBMEGL;
typedef struct _GstGLWindowGBMEGLClass GstGLWindowGBMEGLClass; typedef struct _GstGLWindowGBMEGLClass GstGLWindowGBMEGLClass;
typedef struct _GstGLDisplayGBM GstGLDisplayGBM;
struct _GstGLWindowGBMEGL { struct _GstGLWindowGBMEGL {
/*< private >*/ /*< private >*/
GstGLWindow parent; GstGLWindow parent;
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GstGLAsyncDebug GstGLAsyncDebug;
typedef gchar * (*GstGLAsyncDebugLogGetMessage) (gpointer user_data); typedef gchar * (*GstGLAsyncDebugLogGetMessage) (gpointer user_data);
/** /**
......
...@@ -93,11 +93,11 @@ G_BEGIN_DECLS ...@@ -93,11 +93,11 @@ G_BEGIN_DECLS
ret (GSTGLAPI *name) args; ret (GSTGLAPI *name) args;
#define GST_GL_EXT_END() #define GST_GL_EXT_END()
typedef struct _GstGLFuncs struct _GstGLFuncs
{ {
#include <gst/gl/glprototypes/all_functions.h> #include <gst/gl/glprototypes/all_functions.h>
gpointer padding[GST_PADDING_LARGE*6]; gpointer padding[GST_PADDING_LARGE*6];
} GstGLFuncs; };
#undef GST_GL_EXT_BEGIN #undef GST_GL_EXT_BEGIN
#undef GST_GL_EXT_FUNCTION #undef GST_GL_EXT_FUNCTION
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment