diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-05-23 17:26:38 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-05-23 17:26:38 +0000 |
| commit | 5dc5be10c8f2f82bcb2889e7d48dd462ff66437c (patch) | |
| tree | 2dfbb52045666e6d0fd2b76e09ff08234d718eae /network_io | |
| parent | f4a39f8e4cd8aaa4a7b05bd8f8f85ab4ee13d414 (diff) | |
| download | libapr-5dc5be10c8f2f82bcb2889e7d48dd462ff66437c.tar.gz | |
* network_io/unix/sockaddr.c (apr_getnameinfo): Use apr_uint32_t to
fix build on platforms without uint32_t; use struct sockaddr_in rather
than struct apr_sockaddr_t.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65114 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/unix/sockaddr.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index fbaaeae57..b44af84da 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -581,12 +581,11 @@ APR_DECLARE(apr_status_t) apr_getnameinfo(char **hostname, #if APR_HAVE_IPV6 if (sockaddr->family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sockaddr->sa.sin6.sin6_addr)) { - struct apr_sockaddr_t tmpsa; - tmpsa.sa.sin.sin_family = AF_INET; - tmpsa.sa.sin.sin_addr.s_addr = ((uint32_t *)sockaddr->ipaddr_ptr)[3]; + struct sockaddr_in tmpsa; + tmpsa.sin_family = AF_INET; + tmpsa.sin_addr.s_addr = ((apr_uint32_t *)sockaddr->ipaddr_ptr)[3]; - rc = getnameinfo((const struct sockaddr *)&tmpsa.sa, - sizeof(struct sockaddr_in), + rc = getnameinfo((const struct sockaddr *)&tmpsa, sizeof(tmpsa), tmphostname, sizeof(tmphostname), NULL, 0, flags != 0 ? flags : NI_NAMEREQD); } |