Bring the apr_in_addr type into line with naming conventions and make changes

where appropriate.  At least on my system virtual hosts seem to still work :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86895 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/httpd.h b/include/httpd.h
index 0f68fae9ed4fab5b632220cdafa71cd5d3b27c93..ba87d577c3920412a8af3194d53349d405e218df 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -900,7 +900,7 @@ struct server_addr_rec {
     /** The next server in the list */
     server_addr_rec *next;
     /** The bound address, for this server */
-    apr_in_addr host_addr;
+    apr_in_addr_t host_addr;
     /** The bound port, for this server */
     apr_port_t host_port;
     /** The name given in <VirtualHost> */

diff --git a/server/vhost.c b/server/vhost.c
index edf9e0289c934978253f0754539dd25e030ebed3..a763d879b164d59da8ae525dbc5af5bc17d81530 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -187,7 +187,7 @@ static const char *get_addresses(apr_pool_t *p, const char *w_,
                                 server_addr_rec ***paddr, apr_port_t port)
 {
     struct hostent *hep;
-    apr_in_addr my_addr;
+    apr_in_addr_t my_addr;
     server_addr_rec *sar;
     char *t;
     int i, is_an_ip_addr;
@@ -402,7 +402,7 @@ static name_chain *new_name_chain(apr_pool_t *p, server_rec *s, server_addr_rec
 }
 
 
-static apr_inline ipaddr_chain *find_ipaddr(struct in_addr *server_ip,
+static apr_inline ipaddr_chain *find_ipaddr(apr_in_addr_t *server_ip,
     apr_port_t port)
 {
     unsigned bucket;