Commit ad272db3 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent 5d481e3b

modules/proxy/mod_proxy.h

+2 −2
Original line number Diff line number Diff line
@@ -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*/

/** @} */

modules/proxy/proxy_util.c

+2 −2
Original line number Diff line number Diff line
@@ -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);