tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5bec0d07b4d23f1742e3c218a485b28b232cf09b
commit 5bec0d07b4d23f1742e3c218a485b28b232cf09b
Author: Tom Hacohen <t...@stosb.com>
Date: Wed Apr 20 10:11:21 2016 +0100
Ecore eo: Resolve duplicate Ecore_Cb definition.
---
src/lib/ecore/ecore_job.eo | 2 +-
src/lib/ecore/ecore_types.eot | 1 +
src/lib/elementary/elm_box.eo | 3 +--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo
index fac6b62..26dedec 100644
--- a/src/lib/ecore/ecore_job.eo
+++ b/src/lib/ecore/ecore_job.eo
@@ -1,4 +1,4 @@
-type @extern Ecore_Cb: __undefined_type;
+import ecore_types;
class Ecore.Job (Eo.Base)
{
diff --git a/src/lib/ecore/ecore_types.eot b/src/lib/ecore/ecore_types.eot
index b216524..2c355fe 100644
--- a/src/lib/ecore/ecore_types.eot
+++ b/src/lib/ecore/ecore_types.eot
@@ -1,5 +1,6 @@
type @extern Ecore_Timeline_Cb: __undefined_type;
type @extern Ecore_Task_Cb: __undefined_type;
+type @extern Ecore_Cb: __undefined_type;
enum Ecore.Pos_Map
{
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index ad558f6..c10ae14 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -1,6 +1,5 @@
import evas_box;
-
-type Ecore_Cb: __undefined_type;
+import ecore_types;
class Elm.Box (Elm.Widget)
{
--
