diff options
| author | Matt Turner <mattst88@gmail.com> | 2017-07-06 18:40:53 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-08-21 14:45:44 -0700 |
| commit | 4e97084591c206338af4425c33edb833de348816 (patch) | |
| tree | a3e4f93d121cc85662e78e1c9344c9b926dcd65d /include | |
| parent | db039d67aaae0c3af46cdefe78ea79c5ba860cfe (diff) | |
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 <jordan.l.justen@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/mesa_glinterop.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 { |