Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 45279 invoked from network); 23 May 2004 17:26:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 23 May 2004 17:26:40 -0000 Received: (qmail 94609 invoked by uid 500); 23 May 2004 17:26:41 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 94547 invoked by uid 500); 23 May 2004 17:26:41 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 94523 invoked by uid 98); 23 May 2004 17:26:40 -0000 X-Qmail-Scanner-Mail-From: jorton@apache.org via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 0.0328 secs) Date: 23 May 2004 17:26:39 -0000 Message-ID: <20040523172639.45228.qmail@minotaur.apache.org> From: jorton@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/network_io/unix sockaddr.c X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/05/23 10:26:38 Modified: network_io/unix sockaddr.c Log: * 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. Revision Changes Path 1.51 +4 -5 apr/network_io/unix/sockaddr.c Index: sockaddr.c =================================================================== RCS file: /home/cvs/apr/network_io/unix/sockaddr.c,v retrieving revision 1.50 retrieving revision 1.51 diff -d -u -r1.50 -r1.51 --- sockaddr.c 20 May 2004 14:53:21 -0000 1.50 +++ sockaddr.c 23 May 2004 17:26:38 -0000 1.51 @@ -581,12 +581,11 @@ #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); }