From 8da8c26cd12745cdc2f3d0403f69bf30728c5769 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Thu, 3 Nov 2011 05:35:51 +0000 Subject: [PATCH] Modify placement of PROXY_DECLARE_DATA to fix build problems with MSVC, reported by Gregg L. Smith git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196946 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.h | 4 ++-- modules/proxy/proxy_util.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 7108584fe1..a45adf6434 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -897,8 +897,8 @@ int ap_proxy_lb_workers(void); extern module PROXY_DECLARE_DATA proxy_module; extern int PROXY_DECLARE_DATA proxy_lb_workers; -extern const apr_strmatch_pattern * PROXY_DECLARE_DATA ap_proxy_strmatch_path; -extern const apr_strmatch_pattern * PROXY_DECLARE_DATA ap_proxy_strmatch_domain; +extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_path; +extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_domain; #endif /*MOD_PROXY_H*/ /** @} */ diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 5c1f842366..b0a9c19f7f 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -65,8 +65,8 @@ static struct wstat { /* Global balancer counter */ int PROXY_DECLARE_DATA proxy_lb_workers = 0; static int lb_workers_limit = 0; -const apr_strmatch_pattern * PROXY_DECLARE_DATA ap_proxy_strmatch_path; -const apr_strmatch_pattern * PROXY_DECLARE_DATA ap_proxy_strmatch_domain; +const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_path; +const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_domain; static int proxy_match_ipaddr(struct dirconn_entry *This, request_rec *r); static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r); -- 2.40.0