projects
/
platform
/
upstream
/
enlightenment.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a8d8844
)
Fix include order of EGL & Evas GL
author
Jean-Philippe Andre
<jp.andre@samsung.com>
Fri, 24 Oct 2014 09:17:32 +0000
(18:17 +0900)
committer
Jean-Philippe Andre
<jp.andre@samsung.com>
Fri, 24 Oct 2014 09:17:32 +0000
(18:17 +0900)
Evas_GL.h must be included after EGL.h because it can then skip some
redefinitions of khronos typedefs.
src/bin/e.h
patch
|
blob
|
history
diff --git
a/src/bin/e.h
b/src/bin/e.h
index
349df16
..
dacfbaa
100644
(file)
--- 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>