From edb535a96e58b45eb5ba6d2b25088ad71c728208 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 24 Oct 2014 18:17:32 +0900 Subject: [PATCH] Fix include order of EGL & Evas GL Evas_GL.h must be included after EGL.h because it can then skip some redefinitions of khronos typedefs. --- src/bin/e.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bin/e.h b/src/bin/e.h index 349df16d9..dacfbaa75 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -97,6 +97,11 @@ void *alloca (size_t); # include # endif +/* egl.h must come before Evas_GL.h otherwise they will conflict */ +# ifdef HAVE_WAYLAND_EGL +# include +# endif + # include # include # include