tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2583246997df9875f94ff9334b8f736aaa1d57c0
commit 2583246997df9875f94ff9334b8f736aaa1d57c0
Author: Tom Hacohen <t...@stosb.com>
Date: Wed Mar 23 14:59:40 2016 +0000
Ector: add ector_types.eot for ector type definitions.
This fixes the GLShort duplicate declaration.
---
src/Makefile_Ector.am | 9 +++++++--
src/lib/ector/ector_types.eot | 2 ++
src/lib/ector/gl/ector_gl_surface.eo | 2 +-
src/lib/ector/gl/ector_renderer_gl_base.eo | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index f1a8178..6a3a14a 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -44,14 +44,19 @@ ector_eolian_files_gl = \
lib/ector/gl/ector_renderer_gl_gradient_linear.eo
ector_eolian_gl_h = $(ector_eolian_files_gl:%.eo=%.eo.h)
+ector_eolian_type_files = \
+ lib/ector/ector_types.eot
+
ector_eolian_files = \
$(ector_eolian_files_generic) \
$(ector_eolian_files_cairo) \
$(ector_eolian_files_software) \
- $(ector_eolian_files_gl)
+ $(ector_eolian_files_gl) \
+ $(ector_eolian_type_files)
ector_eolian_c = $(ector_eolian_files:%.eo=%.eo.c)
-ector_eolian_h = $(ector_eolian_files:%.eo=%.eo.h)
+ector_eolian_h = $(ector_eolian_files:%.eo=%.eo.h) \
+ $(ector_eolian_type_files:%.eot=%.eot.h)
BUILT_SOURCES += \
$(ector_eolian_c) \
diff --git a/src/lib/ector/ector_types.eot b/src/lib/ector/ector_types.eot
new file mode 100644
index 0000000..c142a6a
--- /dev/null
+++ b/src/lib/ector/ector_types.eot
@@ -0,0 +1,2 @@
+type @extern GLshort: short; /* FIXME: We should not expose this in the API
but probably redefine it. */
+
diff --git a/src/lib/ector/gl/ector_gl_surface.eo
b/src/lib/ector/gl/ector_gl_surface.eo
index e500514..e3585cd 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -1,4 +1,4 @@
-type @extern GLshort: short; /* FIXME: We should not expose this in the API
but probably redefine it. */
+import ector_types;
class Ector.GL.Surface (Ector.GL.Buffer, Ector.Generic.Surface)
{
diff --git a/src/lib/ector/gl/ector_renderer_gl_base.eo
b/src/lib/ector/gl/ector_renderer_gl_base.eo
index 39c4789..fa1e426 100644
--- a/src/lib/ector/gl/ector_renderer_gl_base.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_base.eo
@@ -1,4 +1,4 @@
-type @extern GLshort: short; /* FIXME: We should not expose this in the API
but probably redefine it. */
+import ector_types;
abstract Ector.Renderer.GL.Base (Ector.Renderer.Generic.Base)
{
--
