tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=65367180bfa1e585d43be64694f3e56ef89a5717
commit 65367180bfa1e585d43be64694f3e56ef89a5717 Author: Tom Hacohen <t...@stosb.com> Date: Wed Feb 17 09:39:53 2016 +0000 Ecore con eet: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/ecore_con/Ecore_Con_Eet.h | 7 +++++++ src/lib/ecore_con/ecore_con_eet_base.eo | 15 +++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_con/Ecore_Con_Eet.h b/src/lib/ecore_con/Ecore_Con_Eet.h index 0498d3c..38d59be 100644 --- a/src/lib/ecore_con/Ecore_Con_Eet.h +++ b/src/lib/ecore_con/Ecore_Con_Eet.h @@ -48,8 +48,15 @@ extern "C" { #endif typedef Eo Ecore_Con_Eet; + +#ifndef _ECORE_CON_EET_BASE_EO_TYPES +#define _ECORE_CON_EET_BASE_EO_TYPES + typedef struct _Ecore_Con_Reply Ecore_Con_Reply; + +#endif + /** * @typedef Ecore_Con_Eet_Data_Cb * @brief Called when an Ecore_Con_Eet object receives data. diff --git a/src/lib/ecore_con/ecore_con_eet_base.eo b/src/lib/ecore_con/ecore_con_eet_base.eo index e0e53f6..3219b42 100644 --- a/src/lib/ecore_con/ecore_con_eet_base.eo +++ b/src/lib/ecore_con/ecore_con_eet_base.eo @@ -1,6 +1,13 @@ +import efl_network_server; + +type @extern Ecore_Con_Eet_Data_Cb: __undefined_type; /* FIXME: function pointers not supported. */ +type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; /* FIXME: function pointers not supported. */ + +struct @extern Eet_Data_Descriptor; +struct Ecore.Con.Reply; + class Ecore.Con.Eet.Base (Eo.Base) { legacy_prefix: null; - eo_prefix: ecore_con_eet_base; methods { @property server { [[The server object to which we send and receive.]] @@ -9,7 +16,7 @@ class Ecore.Con.Eet.Base (Eo.Base) { get { } values { - data: Ecore_Con_Server*; + data: Efl.Network.Server *; } } @property data_callback { @@ -61,7 +68,7 @@ class Ecore.Con.Eet.Base (Eo.Base) { send { [[Function to send data.]] params { - reply: Ecore_Con_Reply *; [[Contains the ecore_con_eet object + reply: Ecore.Con.Reply *; [[Contains the ecore_con_eet object to which the data has to be sent.]] name: const (char) *; [[The name of the eet stream.]] value: void *; [[Actual data]] @@ -70,7 +77,7 @@ class Ecore.Con.Eet.Base (Eo.Base) { raw_send { [[Function to send raw data.]] params { - reply: Ecore_Con_Reply *; [[Contains the ecore_con_eet object + reply: Ecore.Con.Reply *; [[Contains the ecore_con_eet object to which the data has to be sent.]] protocol_name: const (char) *; [[The name of the eet stream.]] section: const (char) *; [[Name of section in the eet descriptor.]] --