ecore_con: fix compilation issues on Windows

Summary:
I do not have a windows setup. So tested by building with option --with-windows-version and it built successfully. Let me know if there are more
issues.

Signed-off-by: Srivardhan Hebbar <sri.hebbar@samsung.com>
Reviewers: jpeg, vtorri, cedric

Reviewed By: cedric

Maniphest Tasks: T3192

Differential Revision: https://phab.enlightenment.org/D3708

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>

diff --git a/src/lib/ecore_con/ecore_con_ares.c b/src/lib/ecore_con/ecore_con_ares.c
index e1c7934..e3d3779 100644 (file)
--- a/src/lib/ecore_con/ecore_con_ares.c
+++ b/src/lib/ecore_con/ecore_con_ares.c
@@ -289,7 +289,7 @@ ecore_con_info_get(Ecore_Con_Server *obj,
                    void *data,
                    struct addrinfo *hints)
 {
-   Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_CAres *cares;
 #ifdef HAVE_IPV6
    int ai_family = AF_INET6;
@@ -434,10 +434,10 @@ _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg,
                              struct hostent *hostent)
 {
    struct sockaddr *addr;
-   Ecore_Con_Server_Data *svr;
+   Efl_Network_Server_Data *svr;
    int addrlen;
 
-   svr = eo_data_scope_get(arg->svr, ECORE_CON_SERVER_CLASS);
+   svr = eo_data_scope_get(arg->svr, EFL_NETWORK_SERVER_CLASS);
 
    /* Found something ? */
    switch (status)

diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 69ef37f..75d71c0 100644 (file)
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -36,7 +36,7 @@ static Eina_Bool
 _ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handler *wh)
 {
    Ecore_Con_Client *obj = data;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLAS);
+   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    void *buf;
    DWORD n;
    Eina_Bool broken_pipe = EINA_FALSE;
@@ -89,7 +89,7 @@ static Eina_Bool
 _ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handler *wh)
 {
    Ecore_Con_Client *obj = data;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLAS);
+   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 #if 0
    char *msg;
@@ -235,7 +235,7 @@ static unsigned int __stdcall
 _ecore_con_local_win32_server_read_client_thread(void *data)
 {
    Ecore_Con_Client *obj = data;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLAS);
+   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    DWORD nbr_bytes = 0;
 
@@ -286,8 +286,8 @@ _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
        (svr->client_count >= (unsigned int)svr->client_limit))
      return ECORE_CALLBACK_CANCEL;
 
-   Ecore_Con_Client *cl_obj = eo_add(EFL_NETWORK_CLIENT_CLAS, NULL);
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLAS);
+   Ecore_Con_Client *cl_obj = eo_add(EFL_NETWORK_CLIENT_CLASS, NULL);
+   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
      {
         ERR("allocation failed");
@@ -506,7 +506,7 @@ ecore_con_local_win32_server_del(Ecore_Con_Server *obj)
 void
 ecore_con_local_win32_client_del(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLAS);
+   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Efl_Network_Server_Data *svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
@@ -706,7 +706,7 @@ ecore_con_local_win32_server_flush(Ecore_Con_Server *obj)
 Eina_Bool
 ecore_con_local_win32_client_flush(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLAS);
+   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Ecore_Con_Type type;
    size_t num;
    BOOL res;