Remove an unused header

[apache] / server / listen.c

diff --git a/server/listen.c b/server/listen.c
index 4d6fffb9489bd9d21f069dec1e3c0ebc04ed31a5..ebcf39db20af53ea59b27fec90400a7e3448cc1c 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -65,7 +65,6 @@
 #include "ap_listen.h"
 #include "apr_strings.h"
 #include "http_log.h"
-#include "mpm.h"
 #include "mpm_common.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -87,8 +86,9 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
     char *ipaddr;
     apr_sockaddr_t *localsa;
 
-    apr_get_port(&port, APR_LOCAL, s);
-    apr_get_ipaddr(&ipaddr, APR_LOCAL, s);
+    apr_get_sockaddr(&localsa, APR_LOCAL, s);
+    apr_get_port(&port, localsa);
+    apr_get_ipaddr(&ipaddr, localsa);
     apr_snprintf(addr, sizeof(addr), "address %s port %u", ipaddr,
                (unsigned) port);
 
@@ -189,11 +189,13 @@ static void alloc_listener(process_rec *process, char *addr, apr_port_t port)
     apr_status_t status;
     char *oldaddr;
     apr_port_t oldport;
+    apr_sockaddr_t *sa;
 
     /* see if we've got an old listener for this address:port */
     for (walk = &old_listeners; *walk; walk = &(*walk)->next) {
-        apr_get_port(&oldport, APR_LOCAL, (*walk)->sd);
-       apr_get_ipaddr(&oldaddr, APR_LOCAL, (*walk)->sd);
+        apr_get_sockaddr(&sa, APR_LOCAL, (*walk)->sd);
+        apr_get_port(&oldport, sa);
+       apr_get_ipaddr(&oldaddr, sa);
        if (!strcmp(oldaddr, addr) && port == oldport) {
            /* re-use existing record */
            new = *walk;
@@ -213,8 +215,9 @@ static void alloc_listener(process_rec *process, char *addr, apr_port_t port)
                  "make_sock: failed to get a socket for %s", addr);
         return;
     }
-    apr_set_port(new->sd, APR_LOCAL, port);
-    apr_set_ipaddr(new->sd, APR_LOCAL, addr);
+    apr_get_sockaddr(&sa, APR_LOCAL, new->sd);
+    apr_set_port(sa, port);
+    apr_set_ipaddr(sa, addr);
     new->next = ap_listeners;
     ap_listeners = new;
 }