Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[732/906] build: fix repeated typedefs
Write forward declarations in another way to avoid repeated typedefs "error: redefinition of typedef". Raised when using i686-apple-darwin11-llvm-gcc-4.2 It seems that C apple compiler does not support C11 feature. https://bugzilla.gnome.org/show_bug.cgi?id=703885
- Loading branch information
Showing
28 changed files
with
129 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* | ||
* GStreamer | ||
* Copyright (C) 2013 Julien Isorce <julien.isorce@gmail.com> | ||
* | ||
* This library is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU Library General Public | ||
* License as published by the Free Software Foundation; either | ||
* version 2 of the License, or (at your option) any later version. | ||
* | ||
* This library is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
* Library General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Library General Public | ||
* License along with this library; if not, write to the | ||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, | ||
* Boston, MA 02110-1301, USA. | ||
*/ | ||
|
||
#ifndef __GL_H__ | ||
#define __GL_H__ | ||
|
||
#include "gstgl_fwd.h" | ||
#include "gstglconfig.h" | ||
#include "gstglapi.h" | ||
#include "gstgldisplay.h" | ||
#include "gstglfeature.h" | ||
#include "gstglutils.h" | ||
#include "gstglwindow.h" | ||
#include "gstglshader.h" | ||
#include "gstglupload.h" | ||
#include "gstgldownload.h" | ||
#include "gstglmemory.h" | ||
#include "gstglbufferpool.h" | ||
#include "gstglframebuffer.h" | ||
#include "gstglfilter.h" | ||
#include "gstglmixer.h" | ||
#include "gstglshadervariables.h" | ||
|
||
#endif /* __GL_H__ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* GStreamer | ||
* Copyright (C) 2013 Julien Isorce <julien.isorce@gmail.com> | ||
* | ||
* This library is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU Library General Public | ||
* License as published by the Free Software Foundation; either | ||
* version 2 of the License, or (at your option) any later version. | ||
* | ||
* This library is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
* Library General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Library General Public | ||
* License along with this library; if not, write to the | ||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, | ||
* Boston, MA 02110-1301, USA. | ||
*/ | ||
|
||
#ifndef __GST_GL_FWD_H__ | ||
#define __GST_GL_FWD_H__ | ||
|
||
#include <gst/gst.h> | ||
|
||
#include "gstglapi.h" | ||
|
||
G_BEGIN_DECLS | ||
|
||
typedef struct _GstGLDisplay GstGLDisplay; | ||
typedef struct _GstGLDisplayClass GstGLDisplayClass; | ||
typedef struct _GstGLDisplayPrivate GstGLDisplayPrivate; | ||
|
||
typedef struct _GstGLWindow GstGLWindow; | ||
typedef struct _GstGLWindowPrivate GstGLWindowPrivate; | ||
typedef struct _GstGLWindowClass GstGLWindowClass; | ||
|
||
typedef struct _GstGLMemory GstGLMemory; | ||
typedef struct _GstGLAllocator GstGLAllocator; | ||
typedef struct _GstGLAllocatorClass GstGLAllocatorClass; | ||
|
||
typedef struct _GstGLShader GstGLShader; | ||
typedef struct _GstGLShaderPrivate GstGLShaderPrivate; | ||
typedef struct _GstGLShaderClass GstGLShaderClass; | ||
|
||
typedef struct _GstGLDownload GstGLDownload; | ||
typedef struct _GstGLDownloadClass GstGLDownloadClass; | ||
typedef struct _GstGLDownloadPrivate GstGLDownloadPrivate; | ||
|
||
typedef struct _GstGLUpload GstGLUpload; | ||
typedef struct _GstGLUploadClass GstGLUploadClass; | ||
typedef struct _GstGLUploadPrivate GstGLUploadPrivate; | ||
|
||
G_END_DECLS | ||
|
||
#endif /* __GST_GL_FWD_H__ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
#include "config.h" | ||
#endif | ||
|
||
#include "gl.h" | ||
#include "gstglbufferpool.h" | ||
|
||
/** | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
#include "config.h" | ||
#endif | ||
|
||
#include "gl.h" | ||
#include "gstglegl.h" | ||
|
||
static const gchar * | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
#include "config.h" | ||
#endif | ||
|
||
#include "gl.h" | ||
#include "gstglshader.h" | ||
|
||
#ifndef GL_COMPILE_STATUS | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.