From: billiob Date: Thu, 4 Feb 2010 10:34:08 +0000 (+0000) Subject: fix ecore_con on posix systems X-Git-Tag: accepted/2.0/20130306.224007~195^2~1119 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db209ba817be94e7c1195f1504c1261d8fcc8b33;p=profile%2Fivi%2Fecore.git fix ecore_con on posix systems git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@45866 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index dc580ae..9a0abc0 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -1044,12 +1044,6 @@ static Ecore_Con_State svr_try_connect(Ecore_Con_Server *svr) } } -#define NIPQUAD(addr) \ - ((unsigned char *)&(addr))[0], \ - ((unsigned char *)&(addr))[1], \ - ((unsigned char *)&(addr))[2], \ - ((unsigned char *)&(addr))[3] - static char * _ecore_con_pretty_ip(struct sockaddr *client_addr, socklen_t size) { @@ -1064,7 +1058,10 @@ _ecore_con_pretty_ip(struct sockaddr *client_addr, socklen_t size) if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) { snprintf(ipbuf, sizeof (ipbuf), "%u.%u.%u.%u", - NIPQUAD(sa6->sin6_addr.s6_addr32[3])); + sa6->sin6_addr.s6_addr[12], + sa6->sin6_addr.s6_addr[13], + sa6->sin6_addr.s6_addr[14], + sa6->sin6_addr.s6_addr[15]); return strdup(ipbuf); } } diff --git a/src/lib/ecore_con/ecore_con_info.c b/src/lib/ecore_con/ecore_con_info.c index 9ef09fb..a4298bd 100644 --- a/src/lib/ecore_con/ecore_con_info.c +++ b/src/lib/ecore_con/ecore_con_info.c @@ -304,7 +304,7 @@ _ecore_con_info_readdata(CB_Data *cbdata) { recv = (Ecore_Con_Info *)torecv; - recv->info.ai_addr = (char *)torecv + sizeof(Ecore_Con_Info); + recv->info.ai_addr = (struct sockaddr *)((char *)torecv + sizeof(Ecore_Con_Info)); if (torecv_len != (sizeof(Ecore_Con_Info) + recv->info.ai_addrlen)) recv->info.ai_canonname = (char *)torecv + sizeof(Ecore_Con_Info) + recv->info.ai_addrlen; else