jpeg pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=edb535a96e58b45eb5ba6d2b25088ad71c728208
commit edb535a96e58b45eb5ba6d2b25088ad71c728208 Author: Jean-Philippe Andre <[email protected]> Date: Fri Oct 24 18:17:32 2014 +0900 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 349df16..dacfbaa 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -97,6 +97,11 @@ void *alloca (size_t); # include <execinfo.h> # endif +/* egl.h must come before Evas_GL.h otherwise they will conflict */ +# ifdef HAVE_WAYLAND_EGL +# include <EGL/egl.h> +# endif + # include <setjmp.h> # include <Eo.h> # include <Eina.h> --
