gl: silence warnings building for RPI related to 'vcos_*'
authorJulien Isorce <julien.isorce@collabora.co.uk>
Wed, 19 Mar 2014 13:48:10 +0000 (13:48 +0000)
committerTim-Philipp Müller <tim@centricular.com>
Sat, 9 Dec 2017 19:31:34 +0000 (19:31 +0000)
Similar than 1190a79b199584cfc4dd62c474531c32cfbba425

ext/gl/gstopengl.c
gst-libs/gst/gl/gstglapi.h

index 6f2ec4963705080bbb54d40a4be76b903c31dad6..d8f9d7b874cc265d123d7fccb8d30fa444f99c1f 100644 (file)
 #include "config.h"
 #endif
 
-#ifdef USE_EGL_RPI
-#include <bcm_host.h>
-#endif
-
 #include "gstglimagesink.h"
 
 #include "gstglfiltercube.h"
 #endif /* HAVE_PNG */
 #endif /* GST_GL_HAVE_OPENGL */
 
+#ifdef USE_EGL_RPI
+#include <bcm_host.h>
+#endif
+
 #define GST_CAT_DEFAULT gst_gl_gstgl_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
index 78951d146b67dab550aa84f97fb2421ecd765bd7..0d8ae3c3270f671bff5f43b2feab37c24ddba8d7 100644 (file)
 #define __GST_GL_API_H__
 
 #include <gst/gl/gstglconfig.h>
-
 #include <gst/gl/glprototypes/gstgl_compat.h>
 
 #if GST_GL_HAVE_PLATFORM_EGL
+
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#ifndef __VCCOREVER__
+#define __VCCOREVER__ 0x04000000
+#endif
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC optimize ("gnu89-inline")
+#endif
+
 #include <EGL/egl.h>
+
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#pragma GCC reset_options
+#pragma GCC diagnostic pop
+#endif
+
 #endif
 
 /* OpenGL 2.0 for Embedded Systems */