httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1728572 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c mod_proxy.h
Date Fri, 05 Feb 2016 00:16:52 GMT
Author: rjung
Date: Fri Feb  5 00:16:52 2016
New Revision: 1728572

URL: http://svn.apache.org/viewvc?rev=1728572&view=rev
Log:
Guess some platforms need PROXY_DECLARE_DATA
for data shared between proxy modules and
declared to be extern.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy.h

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1728572&r1=1728571&r2=1728572&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Fri Feb  5 00:16:52 2016
@@ -44,7 +44,7 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_
 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 "},

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1728572&r1=1728571&r2=1728572&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Fri Feb  5 00:16:52 2016
@@ -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://"
 



Mime
View raw message