From 4e97084591c206338af4425c33edb833de348816 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 6 Jul 2017 18:40:53 -0700 Subject: egl: Fix inclusion of egl.h+mesa_glinterop.h Previously clang would warn about redefinition of typedef EGLDisplay. Avoid this by adding preprocessor guards to mesa_glinterop.h and including it after EGL.h is indirectly included. Reviewed-by: Jordan Justen --- include/GL/mesa_glinterop.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index 173476a988e..45fda93ca24 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -58,12 +58,16 @@ extern "C" { #endif /* Forward declarations to avoid inclusion of GL/glx.h */ +#ifndef GLX_H struct _XDisplay; struct __GLXcontextRec; +#endif /* Forward declarations to avoid inclusion of EGL/egl.h */ +#ifndef __egl_h_ typedef void *EGLDisplay; typedef void *EGLContext; +#endif /** Returned error codes. */ enum { -- cgit v1.2.3