diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2004-05-24 11:27:45 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2004-05-24 11:27:45 +0000 |
| commit | f3dc063667f858ed8ff99dc2a47b139b2f6f5b44 (patch) | |
| tree | 230ef947535b631c390ce3d2ad32ccf1a80f3405 | |
| parent | d32c66adc4c9a34935965b3befb65f8769c80fdb (diff) | |
| download | libapr-f3dc063667f858ed8ff99dc2a47b139b2f6f5b44.tar.gz | |
backport this from 1.0-dev:
* 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.
Submitted by: Joe Orton
Reviewed by: Jeff Trawick
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/APR_0_9_BRANCH@65123 13f79535-47bb-0310-9956-ffa450edef68
| -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 614ffb813..bc3076b10 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -609,12 +609,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); } |