From 559d4e8b68cba8da58ceba70d4e637f8190e23ec Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric@osg.samsung.com>
Date: Thu, 21 Apr 2016 11:56:15 -0700
Subject: [PATCH] ecore: give the mainloop its own private data.

---
 src/lib/ecore/ecore_main.c      | 14 +++++++-------
 src/lib/ecore/ecore_mainloop.eo |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index aac6a54a96..4a6f52d3c6 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2724,42 +2724,42 @@ EAPI Eo *ecore_main_loop_get(void)
 }
 
 EOLIAN static void
-_ecore_mainloop_select_func_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Ecore_Select_Function select_func)
+_ecore_mainloop_select_func_set(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED, Ecore_Select_Function select_func)
 {
    ecore_main_loop_select_func_set(select_func);
 }
 
 EOLIAN static Ecore_Select_Function
-_ecore_mainloop_select_func_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
+_ecore_mainloop_select_func_get(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED)
 {
    return ecore_main_loop_select_func_get();
 }
 
 EOLIAN static void
-_ecore_mainloop_iterate(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
+_ecore_mainloop_iterate(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED)
 {
    ecore_main_loop_iterate();
 }
 
-EOLIAN static int _ecore_mainloop_iterate_may_block(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int may_block)
+EOLIAN static int _ecore_mainloop_iterate_may_block(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED, int may_block)
 {
    return ecore_main_loop_iterate_may_block(may_block);
 }
 
 EOLIAN static void
-_ecore_mainloop_begin(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
+_ecore_mainloop_begin(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED)
 {
    ecore_main_loop_begin();
 }
 
 EOLIAN static void
-_ecore_mainloop_quit(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
+_ecore_mainloop_quit(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
 
 EOLIAN static Eina_Bool
-_ecore_mainloop_animator_ticked(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
+_ecore_mainloop_animator_ticked(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED)
 {
    return ecore_main_loop_animator_ticked_get();
 }
diff --git a/src/lib/ecore/ecore_mainloop.eo b/src/lib/ecore/ecore_mainloop.eo
index 42ab70283a..076cb46c06 100644
--- a/src/lib/ecore/ecore_mainloop.eo
+++ b/src/lib/ecore/ecore_mainloop.eo
@@ -12,7 +12,6 @@ class Ecore_Mainloop (Eo.Base)
    great responsiveness without the need for threads(or any other concurrency).
    ]]
    legacy_prefix: null;
-   data: null;
    methods {
       @property select_func {
          [[Function to use when monitoring multiple file descriptors.]]