mirror of https://gitlab.freedesktop.org/mesa/mesa
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>
This commit is contained in:
parent
db039d67aa
commit
4e97084591
|
@ -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 {
|
||||
|
|
|
@ -46,7 +46,6 @@
|
|||
#endif
|
||||
#include <GL/gl.h>
|
||||
#include <GL/internal/dri_interface.h>
|
||||
#include "GL/mesa_glinterop.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
|
@ -61,6 +60,7 @@
|
|||
#endif
|
||||
|
||||
#include "egl_dri2.h"
|
||||
#include "GL/mesa_glinterop.h"
|
||||
#include "loader/loader.h"
|
||||
#include "util/u_atomic.h"
|
||||
#include "util/u_vector.h"
|
||||
|
|
|
@ -88,7 +88,6 @@
|
|||
#include <string.h>
|
||||
#include "c99_compat.h"
|
||||
#include "c11/threads.h"
|
||||
#include "GL/mesa_glinterop.h"
|
||||
#include "util/macros.h"
|
||||
|
||||
#include "eglglobals.h"
|
||||
|
@ -102,6 +101,7 @@
|
|||
#include "eglimage.h"
|
||||
#include "eglsync.h"
|
||||
|
||||
#include "GL/mesa_glinterop.h"
|
||||
|
||||
/**
|
||||
* Macros to help return an API entrypoint.
|
||||
|
|
Loading…
Reference in New Issue