From fa29d04871ab786349b362fdb95db2ab7fe34e2d Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Fri, 5 Feb 2016 00:16:52 +0000 Subject: [PATCH] Guess some platforms need PROXY_DECLARE_DATA for data shared between proxy modules and declared to be extern. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728572 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 4 ++-- modules/proxy/mod_proxy.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 26a279feba..1594879074 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -44,7 +44,7 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup, static APR_OPTIONAL_FN_TYPE(set_worker_hc_param) *set_worker_hc_param_f = NULL; /* Externals */ -proxy_hcmethods_t proxy_hcmethods[] = { +proxy_hcmethods_t PROXY_DECLARE_DATA proxy_hcmethods[] = { {NONE, "NONE", 1}, {TCP, "TCP", 1}, {OPTIONS, "OPTIONS", 1}, @@ -55,7 +55,7 @@ proxy_hcmethods_t proxy_hcmethods[] = { {EOT, NULL, 1} }; -proxy_wstat_t proxy_wstat_tbl[] = { +proxy_wstat_t PROXY_DECLARE_DATA proxy_wstat_tbl[] = { {PROXY_WORKER_INITIALIZED, PROXY_WORKER_INITIALIZED_FLAG, "Init "}, {PROXY_WORKER_IGNORE_ERRORS, PROXY_WORKER_IGNORE_ERRORS_FLAG, "Ign "}, {PROXY_WORKER_DRAIN, PROXY_WORKER_DRAIN_FLAG, "Drn "}, diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 09671af22c..95c948e7f0 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -92,8 +92,8 @@ typedef struct { } proxy_wstat_t; /* These 2 are in mod_proxy.c */ -extern proxy_hcmethods_t proxy_hcmethods[]; -extern proxy_wstat_t proxy_wstat_tbl[]; +PROXY_DECLARE_DATA extern proxy_hcmethods_t proxy_hcmethods[]; +PROXY_DECLARE_DATA extern proxy_wstat_t proxy_wstat_tbl[]; #define BALANCER_PREFIX "balancer://"