diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-12-02 15:36:46 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-12-02 15:36:46 +0000 |
| commit | b49338ee972a66fb6e5ece4b97440d0c3cfa642b (patch) | |
| tree | 0a3df788f90101bd04b667021eac514355f22b1f /pjlib/src/pj/os_symbian.h | |
| parent | ea951533e9d970b9fd9d98b34081f568679d9bfc (diff) | |
More ticket #415: Added pj_sockaddr_get_len() and pj_inet_ntop2(), and fixed Symbian combilation warnings with gcce
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1608 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pj/os_symbian.h')
| -rw-r--r-- | pjlib/src/pj/os_symbian.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pjlib/src/pj/os_symbian.h b/pjlib/src/pj/os_symbian.h index f564075f..8fe4783d 100644 --- a/pjlib/src/pj/os_symbian.h +++ b/pjlib/src/pj/os_symbian.h @@ -244,12 +244,12 @@ public: pj_bzero(&pj_addr, sizeof(pj_sockaddr)); pj_addr.addr.sa_family = (pj_uint16_t)sym_addr.Family(); if (pj_addr.addr.sa_family == PJ_AF_INET) { - PJ_ASSERT_RETURN(*addr_len >= sizeof(pj_sockaddr_in), PJ_ETOOSMALL); + PJ_ASSERT_RETURN(*addr_len>=(int)sizeof(pj_sockaddr_in), PJ_ETOOSMALL); pj_addr.ipv4.sin_addr.s_addr = pj_htonl(sym_addr.Address()); pj_addr.ipv4.sin_port = pj_htons((pj_uint16_t) sym_addr.Port()); *addr_len = sizeof(pj_sockaddr_in); } else if (pj_addr.addr.sa_family == PJ_AF_INET6) { - PJ_ASSERT_RETURN(*addr_len >= sizeof(pj_sockaddr_in6), PJ_ETOOSMALL); + PJ_ASSERT_RETURN(*addr_len>=(int)sizeof(pj_sockaddr_in6), PJ_ETOOSMALL); const TIp6Addr & ip6 = sym_addr.Ip6Address(); pj_memcpy(&pj_addr.ipv6.sin6_addr, ip6.u.iAddr8, 16); pj_addr.ipv6.sin6_port = pj_htons((pj_uint16_t) sym_addr.Port()); @@ -271,14 +271,14 @@ public: TInetAddr & sym_addr) { if (pj_addr.addr.sa_family == PJ_AF_INET) { - PJ_ASSERT_RETURN(addrlen >= sizeof(pj_sockaddr_in), PJ_EINVAL); + PJ_ASSERT_RETURN(addrlen >= (int)sizeof(pj_sockaddr_in), PJ_EINVAL); sym_addr.Init(KAfInet); sym_addr.SetAddress((TUint32)pj_ntohl(pj_addr.ipv4.sin_addr.s_addr)); sym_addr.SetPort(pj_ntohs(pj_addr.ipv4.sin_port)); } else if (pj_addr.addr.sa_family == PJ_AF_INET6) { TIp6Addr ip6; - PJ_ASSERT_RETURN(addrlen >= sizeof(pj_sockaddr_in6), PJ_EINVAL); + PJ_ASSERT_RETURN(addrlen>=(int)sizeof(pj_sockaddr_in6), PJ_EINVAL); pj_memcpy(ip6.u.iAddr8, &pj_addr.ipv6.sin6_addr, 16); sym_addr.Init(KAfInet6); sym_addr.SetAddress(ip6); |