Fix win32 compile breakage.

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

diff --git a/include/http_vhost.h b/include/http_vhost.h
index 3d0e3ce5d1145764e0abea14e0b99ba341f80489..eaa0bc040004d5ce01f0a4706a51c6f02f85fca0 100644 (file)
--- a/include/http_vhost.h
+++ b/include/http_vhost.h
@@ -67,7 +67,7 @@ extern "C" {
  * called before any config is read
  * @param p Pool to allocate out of
  */
-void ap_init_vhost_config(apr_pool_t *p);
+AP_DECLARE(void) ap_init_vhost_config(apr_pool_t *p);
 
 /**
  * called after the config has been read to compile the tables needed to do 
@@ -94,14 +94,14 @@ const char *ap_set_name_virtual_host (cmd_parms *cmd, void *dummy,
  * given an ip address only, give our best guess as to what vhost it is 
  * @param conn The current connection
  */
-void ap_update_vhost_given_ip(conn_rec *conn);
+AP_DECLARE(void) ap_update_vhost_given_ip(conn_rec *conn);
 
 /**
  * ap_update_vhost_given_ip is never enough, and this is always called after 
  * the headers have been read.  It may change r->server.
  * @param r The current request
  */
-void ap_update_vhost_from_headers(request_rec *r);
+AP_DECLARE(void) ap_update_vhost_from_headers(request_rec *r);
 
 /**
  * Match the host in the header with the hostname of the server for this

diff --git a/server/vhost.c b/server/vhost.c
index fe29e8067545113762cb24749db178e98d503d2b..967d785d3f9371c523cdf445c3278edf70663515 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -161,7 +161,7 @@ static server_addr_rec **name_vhost_list_tail;
 
 
 /* called at the beginning of the config */
-void ap_init_vhost_config(apr_pool_t *p)
+AP_DECLARE(void) ap_init_vhost_config(apr_pool_t *p)
 {
     memset(iphash_table, 0, sizeof(iphash_table));
     default_list = NULL;
@@ -997,7 +997,7 @@ static void check_serverpath(request_rec *r)
 }
 
 
-void ap_update_vhost_from_headers(request_rec *r)
+AP_DECLARE(void) ap_update_vhost_from_headers(request_rec *r)
 {
     /* must set this for HTTP/1.1 support */
     if (r->hostname || (r->hostname = apr_table_get(r->headers_in, "Host"))) {
@@ -1018,7 +1018,7 @@ void ap_update_vhost_from_headers(request_rec *r)
 /* Called for a new connection which has a known local_addr.  Note that the
  * new connection is assumed to have conn->server == main server.
  */
-void ap_update_vhost_given_ip(conn_rec *conn)
+AP_DECLARE(void) ap_update_vhost_given_ip(conn_rec *conn)
 {
     ipaddr_chain *trav;
     apr_port_t port;