On Thu, 6 Oct 2011, Rüdiger Plüm wrote:
Author: sf
Date: Wed Oct 5 21:25:58 2011
New Revision: 1179448
URL: http://svn.apache.org/viewvc?rev=1179448&view=rev
Log:
Export ap_max_mem_free, needed by r1178079, as pointed out by Gregg L. Smith
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/include/mpm_common.h
httpd/httpd/trunk/server/mpm_common.c
Modified: httpd/httpd/trunk/include/mpm_common.h
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=1179448&r1=1179447&r2=1179448&view=diff
==============================================================================
--- httpd/httpd/trunk/include/mpm_common.h (original)
+++ httpd/httpd/trunk/include/mpm_common.h Wed Oct 5 21:25:58 2011
@@ -314,7 +314,7 @@ AP_INIT_TAKE1("GracefulShutdownTimeout",
int ap_signal_server(int *, apr_pool_t *);
void ap_mpm_rewrite_args(process_rec *);
-extern apr_uint32_t ap_max_mem_free;
+AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
Shouldn't that be
extern apr_uint32_t AP_DECLARE_DATA ap_max_mem_free;
True, thanks. Fixed in r1179715.
Modified: httpd/httpd/trunk/server/mpm_common.c
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1179448&r1=1179447&r2=1179448&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Wed Oct 5 21:25:58 2011
@@ -142,7 +142,7 @@ int ap_max_requests_per_child;
char ap_coredump_dir[MAX_STRING_LEN];
int ap_coredumpdir_configured;
int ap_graceful_shutdown_timeout;
-apr_uint32_t ap_max_mem_free;
+AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
Shouldn't that be
apr_uint32_t AP_DECLARE_DATA ap_max_mem_free;
The other uses in server/*.c have the AP_DECLARE_DATA first, too. Probably
both orders work.
