From 8f4ba29f972eb13c0433669a98d68ae1ca61afb1 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Tue, 15 Dec 2015 19:25:16 -0500 Subject: [PATCH] gl: Allow using non-system mesa with both GL and GLES GCC automatically disable redundance warnings for system headers. As soon as we start using a non-system installed mesa, we would start having issues. The test for both wasn't setting any flags, so it would work but then fail at runtime. This is being fixed by disabling in the code (where needed only) that GCC warning. The test is also fixed to avoid the false positive we had. --- gst-libs/gst/gl/gstglapi.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index dd44b45239..ab1a203f52 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -23,6 +23,13 @@ #include +/* This mimic GCC behaviour with system headers files even if GL headers may + * not be in the system header path. */ +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + /* OpenGL 2.0 for Embedded Systems */ #if GST_GL_HAVE_GLES2 #ifndef GL_GLEXT_PROTOTYPES @@ -57,6 +64,10 @@ # endif #endif +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #ifdef WINAPI #define GSTGLAPI WINAPI #else