Add the AP_DECLARE()/AP_CORE_DECLARE macros on the return types of

functions used by mod_proxy for export in DLL
Submitted by:	Ian Holsman <IanH@cnet.com>
Reviewed by:	Chuck murcko

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

diff --git a/CHANGES b/CHANGES
index 77d4cab9130d32842e1301e336dd5302bd397ec4..a1abe17597c38d0df965a1e40d65d6623ac9de44 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.18-dev
 
+  *) Add the AP_DECLARE()/AP_CORE_DECLARE macros on the return types
+     of functions used by mod_proxy for export in the DLL 
+     [Ian Holsman <IanH@cnet.com>]
+
   *) Prevent a hang when a cgi handled by mod_cgid tries to read a
      request body from its stdin but no reqest body is being written to 
      the cgi.  [Jeff Trawick]

diff --git a/include/http_config.h b/include/http_config.h
index 27b45c3e750747122792c8e373fba6b5575caef1..c523f5e4a840762e6544ae56633b822933c59a04 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -840,7 +840,7 @@ AP_DECLARE(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server);
  * @param p The pool to allocate the config vector out of
  * @return The config vector
  */
-ap_conf_vector_t *ap_create_request_config(apr_pool_t *p);
+AP_DECLARE(ap_conf_vector_t*) ap_create_request_config(apr_pool_t *p);
 
 /**
  * Setup the config vector for per dir module configs

diff --git a/include/http_connection.h b/include/http_connection.h
index 4636744008feb3fe9c340f43156b7a2920b47e8c..6053d899a161bde535a1bc249d234feff00882a2 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -75,7 +75,7 @@ extern "C" {
  * @param id ID of this connection; unique at any point in time.
  * @return new conn_rec, or NULL if the connection has already been reset
  */
-conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
+AP_CORE_DECLARE(conn_rec *)ap_new_connection(apr_pool_t *p, server_rec *server, 
                             apr_socket_t *inout, long id);
 
 /**

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 95ace2ed162a0b64f95195961a8f945d4492f190..4ca84676397131b4e7cd215dab16d163622fbeab 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -961,7 +961,7 @@ AP_DECLARE(int) ap_send_http_trace(request_rec *r)
     return OK;
 }
 
-int ap_send_http_options(request_rec *r)
+AP_DECLARE(int) ap_send_http_options(request_rec *r)
 {
     if (r->assbackwards)
         return DECLINED;

diff --git a/modules/http/mod_core.h b/modules/http/mod_core.h
index f01f6a0f1fa4e87881478fe6f0692477b702052e..0a1991f232e550699a2d823805c37b8f0fd96932 100644 (file)
--- a/modules/http/mod_core.h
+++ b/modules/http/mod_core.h
@@ -92,7 +92,7 @@ char *ap_response_code_string(request_rec *r, int error_index);
 AP_DECLARE(void) ap_basic_http_header(request_rec *r, apr_bucket_brigade *bb);
  
 AP_DECLARE(int) ap_send_http_trace(request_rec *r);
-int ap_send_http_options(request_rec *r);
+AP_DECLARE(int) ap_send_http_options(request_rec *r);
 
 #ifdef __cplusplus
 }

diff --git a/server/config.c b/server/config.c
index 689b3477779688e64fad2d5e8050ffdb5839d9a6..c877329db50fdb91db17f3f6908c404c6be69060 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -251,7 +251,7 @@ static void merge_server_configs(apr_pool_t *p, ap_conf_vector_t *base,
     }
 }
 
-ap_conf_vector_t *ap_create_request_config(apr_pool_t *p)
+AP_CORE_DECLARE(ap_conf_vector_t *)ap_create_request_config(apr_pool_t *p)
 {
     return create_empty_config(p);
 }

diff --git a/server/connection.c b/server/connection.c
index 297d4eef8ed3ff398155234ea1e6693e53a6db2a..3f706a5e2417317bab8cba80b847dcd8168162dd 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -221,7 +221,7 @@ AP_CORE_DECLARE(void) ap_process_connection(conn_rec *c)
    structure, but for now...
 */
 
-conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
+AP_CORE_DECLARE(conn_rec *)ap_new_connection(apr_pool_t *p, server_rec *server, 
                             apr_socket_t *inout, long id)
 {
     conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));