Ecore ecore_con:

 * include arpa/inet.h if it is detected
 * use correct types
 * small cleanup

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@57503 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index dbf1039..3131551 100644 (file)
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -381,7 +381,7 @@ error:
    if (svr->path)
      free(svr->path);
 
-#ifndef _WIN32
+
    if (svr->fd_handler)
      ecore_main_fd_handler_del(svr->fd_handler);
 
@@ -394,7 +394,6 @@ error:
    if (svr->ip)
      eina_stringshare_del(svr->ip);
 
-#endif
    ecore_con_ssl_server_shutdown(svr);
    free(svr);
    return NULL;
@@ -1852,7 +1851,7 @@ svr_try_connect_plain(Ecore_Con_Server *svr)
 {
    int res;
    int so_err = 0;
-   unsigned int size = sizeof(int);
+   socklen_t size = sizeof(int);
 
    res = getsockopt(svr->fd, SOL_SOCKET, SO_ERROR, (void *)&so_err, &size);
 #ifdef _WIN32
@@ -2161,14 +2160,14 @@ _ecore_con_svr_udp_handler(void             *data,
 {
    unsigned char buf[READBUFSIZ];
    unsigned char client_addr[256];
-   unsigned int client_addr_len = sizeof(client_addr);
+   socklen_t client_addr_len = sizeof(client_addr);
    int num;
    Ecore_Con_Server *svr;
    Ecore_Con_Client *cl = NULL;
 
    svr = data;
 
-   if (svr->delete_me || svr->dead) 
+   if (svr->delete_me || svr->dead)
      return ECORE_CALLBACK_RENEW;
 
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
@@ -2183,7 +2182,7 @@ _ecore_con_svr_udp_handler(void             *data,
 #ifdef _WIN32
    num = fcntl(svr->fd, F_SETFL, O_NONBLOCK);
    if (num >= 0)
-     num = recvfrom(svr->fd, buf, sizeof(buf), 0,
+     num = recvfrom(svr->fd, (char *)buf, sizeof(buf), 0,
                 (struct sockaddr *)&client_addr,
                 &client_addr_len);
 

diff --git a/src/lib/ecore_con/ecore_con_ares.c b/src/lib/ecore_con/ecore_con_ares.c
index ea8ec82..5800c67 100644 (file)
--- a/src/lib/ecore_con/ecore_con_ares.c
+++ b/src/lib/ecore_con/ecore_con_ares.c
@@ -10,7 +10,11 @@
  */
 
 #include <string.h>
-#include <arpa/inet.h>
+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+
 #include <ares.h>
 
 #include "Ecore.h"
@@ -63,7 +67,7 @@ static Eina_Bool _ecore_con_info_cares_timeout_cb(void *data);
 
 static void
 _ecore_con_info_cares_state_cb(void *data,
-                               int   fd,
+                               ares_socket_t   fd,
                                int read,
                                int write);
 static int
@@ -347,7 +351,7 @@ _ecore_con_info_fds_search(const Ecore_Con_FD *fd1,
 
 static void
 _ecore_con_info_cares_state_cb(void *data __UNUSED__,
-                               int   fd,
+                               ares_socket_t fd,
                                int read,
                                int write)
 {