svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

[sf...@apache.org]

Author: sf
Date: Sun Jun  6 16:59:50 2010
New Revision: 951895

URL: http://svn.apache.org/viewvc?rev=951895&view=rev
Log:
Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels

Modified:
    httpd/httpd/trunk/modules/aaa/mod_access_compat.c
    httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
    httpd/httpd/trunk/modules/aaa/mod_auth_form.c
    httpd/httpd/trunk/modules/aaa/mod_authn_anon.c
    httpd/httpd/trunk/modules/aaa/mod_authn_core.c
    httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
    httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authn_file.c
    httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
    httpd/httpd/trunk/modules/aaa/mod_authz_core.c
    httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
    httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
    httpd/httpd/trunk/modules/aaa/mod_authz_host.c
    httpd/httpd/trunk/modules/aaa/mod_authz_owner.c
    httpd/httpd/trunk/modules/aaa/mod_authz_user.c
    httpd/httpd/trunk/modules/arch/netware/mod_netware.c
    httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
    httpd/httpd/trunk/modules/arch/unix/mod_privileges.c
    httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
    httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
    httpd/httpd/trunk/modules/arch/win32/mod_win32.c
    httpd/httpd/trunk/modules/cache/cache_cache.c
    httpd/httpd/trunk/modules/cache/cache_storage.c
    httpd/httpd/trunk/modules/cache/cache_util.c
    httpd/httpd/trunk/modules/cache/mod_cache.c
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c
    httpd/httpd/trunk/modules/cache/mod_file_cache.c
    httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
    httpd/httpd/trunk/modules/cache/mod_socache_dc.c
    httpd/httpd/trunk/modules/cache/mod_socache_memcache.c
    httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
    httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
    httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
    httpd/httpd/trunk/modules/core/mod_so.c
    httpd/httpd/trunk/modules/core/mod_watchdog.c
    httpd/httpd/trunk/modules/database/mod_dbd.c
    httpd/httpd/trunk/modules/dav/fs/mod_dav_fs.c
    httpd/httpd/trunk/modules/dav/lock/mod_dav_lock.c
    httpd/httpd/trunk/modules/dav/main/mod_dav.c
    httpd/httpd/trunk/modules/dav/main/util_lock.c
    httpd/httpd/trunk/modules/debugging/mod_bucketeer.c
    httpd/httpd/trunk/modules/debugging/mod_dumpio.c
    httpd/httpd/trunk/modules/echo/mod_echo.c
    httpd/httpd/trunk/modules/examples/mod_case_filter.c
    httpd/httpd/trunk/modules/examples/mod_case_filter_in.c
    httpd/httpd/trunk/modules/examples/mod_example_hooks.c
    httpd/httpd/trunk/modules/examples/mod_example_ipc.c
    httpd/httpd/trunk/modules/experimental/mod_noloris.c
    httpd/httpd/trunk/modules/filters/mod_buffer.c
    httpd/httpd/trunk/modules/filters/mod_charset_lite.c
    httpd/httpd/trunk/modules/filters/mod_deflate.c
    httpd/httpd/trunk/modules/filters/mod_ext_filter.c
    httpd/httpd/trunk/modules/filters/mod_filter.c
    httpd/httpd/trunk/modules/filters/mod_include.c
    httpd/httpd/trunk/modules/filters/mod_ratelimit.c
    httpd/httpd/trunk/modules/filters/mod_reflector.c
    httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
    httpd/httpd/trunk/modules/filters/mod_request.c
    httpd/httpd/trunk/modules/filters/mod_sed.c
    httpd/httpd/trunk/modules/filters/mod_substitute.c
    httpd/httpd/trunk/modules/generators/mod_asis.c
    httpd/httpd/trunk/modules/generators/mod_autoindex.c
    httpd/httpd/trunk/modules/generators/mod_cgi.c
    httpd/httpd/trunk/modules/generators/mod_cgid.c
    httpd/httpd/trunk/modules/generators/mod_info.c
    httpd/httpd/trunk/modules/generators/mod_status.c
    httpd/httpd/trunk/modules/generators/mod_suexec.c
    httpd/httpd/trunk/modules/http/byterange_filter.c
    httpd/httpd/trunk/modules/http/http_core.c
    httpd/httpd/trunk/modules/http/http_filters.c
    httpd/httpd/trunk/modules/http/http_protocol.c
    httpd/httpd/trunk/modules/http/http_request.c
    httpd/httpd/trunk/modules/http/mod_mime.c
    httpd/httpd/trunk/modules/ldap/util_ldap.c
    httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
    httpd/httpd/trunk/modules/loggers/mod_log_config.c
    httpd/httpd/trunk/modules/loggers/mod_log_forensic.c
    httpd/httpd/trunk/modules/loggers/mod_logio.c
    httpd/httpd/trunk/modules/lua/lua_config.c
    httpd/httpd/trunk/modules/lua/lua_request.c
    httpd/httpd/trunk/modules/lua/lua_vmprep.c
    httpd/httpd/trunk/modules/lua/mod_lua.c
    httpd/httpd/trunk/modules/mappers/mod_actions.c
    httpd/httpd/trunk/modules/mappers/mod_alias.c
    httpd/httpd/trunk/modules/mappers/mod_dir.c
    httpd/httpd/trunk/modules/mappers/mod_imagemap.c
    httpd/httpd/trunk/modules/mappers/mod_negotiation.c
    httpd/httpd/trunk/modules/mappers/mod_rewrite.c
    httpd/httpd/trunk/modules/mappers/mod_speling.c
    httpd/httpd/trunk/modules/mappers/mod_userdir.c
    httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c
    httpd/httpd/trunk/modules/metadata/mod_cern_meta.c
    httpd/httpd/trunk/modules/metadata/mod_env.c
    httpd/httpd/trunk/modules/metadata/mod_expires.c
    httpd/httpd/trunk/modules/metadata/mod_headers.c
    httpd/httpd/trunk/modules/metadata/mod_ident.c
    httpd/httpd/trunk/modules/metadata/mod_mime_magic.c
    httpd/httpd/trunk/modules/metadata/mod_remoteip.c
    httpd/httpd/trunk/modules/metadata/mod_setenvif.c
    httpd/httpd/trunk/modules/metadata/mod_unique_id.c
    httpd/httpd/trunk/modules/metadata/mod_usertrack.c
    httpd/httpd/trunk/modules/metadata/mod_version.c
    httpd/httpd/trunk/modules/proxy/ajp_header.c
    httpd/httpd/trunk/modules/proxy/ajp_link.c
    httpd/httpd/trunk/modules/proxy/ajp_msg.c
    httpd/httpd/trunk/modules/proxy/ajp_utils.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
    httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c
    httpd/httpd/trunk/modules/proxy/mod_serf.c
    httpd/httpd/trunk/modules/proxy/proxy_util.c
    httpd/httpd/trunk/modules/session/mod_session.c
    httpd/httpd/trunk/modules/session/mod_session_cookie.c
    httpd/httpd/trunk/modules/session/mod_session_crypto.c
    httpd/httpd/trunk/modules/session/mod_session_dbd.c
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
    httpd/httpd/trunk/modules/test/mod_dialup.c
    httpd/httpd/trunk/modules/test/mod_optional_fn_export.c
    httpd/httpd/trunk/modules/test/mod_optional_fn_import.c
    httpd/httpd/trunk/modules/test/mod_optional_hook_export.c
    httpd/httpd/trunk/modules/test/mod_optional_hook_import.c
    httpd/httpd/trunk/os/bs2000/os.c
    httpd/httpd/trunk/os/unix/unixd.c
    httpd/httpd/trunk/server/core_filters.c
    httpd/httpd/trunk/server/listen.c
    httpd/httpd/trunk/server/main.c
    httpd/httpd/trunk/server/mpm/event/event.c
    httpd/httpd/trunk/server/mpm/event/pod.c
    httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c
    httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c
    httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
    httpd/httpd/trunk/server/mpm/prefork/prefork.c
    httpd/httpd/trunk/server/mpm/simple/simple_api.c
    httpd/httpd/trunk/server/mpm/simple/simple_children.c
    httpd/httpd/trunk/server/mpm/simple/simple_core.c
    httpd/httpd/trunk/server/mpm/simple/simple_io.c
    httpd/httpd/trunk/server/mpm/simple/simple_run.c
    httpd/httpd/trunk/server/mpm/winnt/child.c
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
    httpd/httpd/trunk/server/mpm/winnt/service.c
    httpd/httpd/trunk/server/mpm/worker/pod.c
    httpd/httpd/trunk/server/mpm/worker/worker.c
    httpd/httpd/trunk/server/mpm_common.c
    httpd/httpd/trunk/server/mpm_unix.c
    httpd/httpd/trunk/server/protocol.c
    httpd/httpd/trunk/server/request.c
    httpd/httpd/trunk/server/scoreboard.c
    httpd/httpd/trunk/server/util.c
    httpd/httpd/trunk/server/util_cookies.c
    httpd/httpd/trunk/server/util_ebcdic.c
    httpd/httpd/trunk/server/util_expr.c
    httpd/httpd/trunk/server/util_filter.c
    httpd/httpd/trunk/server/util_mutex.c
    httpd/httpd/trunk/server/util_script.c
    httpd/httpd/trunk/server/util_xml.c
    httpd/httpd/trunk/server/vhost.c

Modified: httpd/httpd/trunk/modules/aaa/mod_access_compat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_access_compat.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_access_compat.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_access_compat.c Sun Jun  6 16:59:50 2010
@@ -368,7 +368,7 @@ static void register_hooks(apr_pool_t *p
                          AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA access_compat_module =
+AP_DECLARE_MODULE(access_compat) =
 {
     STANDARD20_MODULE_STUFF,
     create_access_compat_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_basic.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_basic.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_basic.c Sun Jun  6 16:59:50 2010
@@ -292,7 +292,7 @@ static void register_hooks(apr_pool_t *p
                         AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA auth_basic_module =
+AP_DECLARE_MODULE(auth_basic) =
 {
     STANDARD20_MODULE_STUFF,
     create_auth_basic_dir_config,  /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Sun Jun  6 16:59:50 2010
@@ -2056,7 +2056,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_fixups(add_auth_info, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA auth_digest_module =
+AP_DECLARE_MODULE(auth_digest) =
 {
     STANDARD20_MODULE_STUFF,
     create_digest_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_form.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_form.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_form.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_form.c Sun Jun  6 16:59:50 2010
@@ -1185,7 +1185,7 @@ static void register_hooks(apr_pool_t * 
     ap_hook_handler(authenticate_form_redirect_handler, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA auth_form_module =
+AP_DECLARE_MODULE(auth_form) =
 {
     STANDARD20_MODULE_STUFF,
     create_auth_form_dir_config, /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_anon.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_anon.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_anon.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_anon.c Sun Jun  6 16:59:50 2010
@@ -203,7 +203,7 @@ static void register_hooks(apr_pool_t *p
                               &authn_anon_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_anon_module =
+AP_DECLARE_MODULE(authn_anon) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_anon_dir_config, /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_core.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_core.c Sun Jun  6 16:59:50 2010
@@ -367,7 +367,7 @@ static void register_hooks(apr_pool_t *p
                         AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_core_module =
+AP_DECLARE_MODULE(authn_core) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_core_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c Sun Jun  6 16:59:50 2010
@@ -273,7 +273,7 @@ static void authn_dbd_hooks(apr_pool_t *
                               AUTHN_PROVIDER_VERSION,
                               &authn_dbd_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
-module AP_MODULE_DECLARE_DATA authn_dbd_module =
+AP_DECLARE_MODULE(authn_dbd) =
 {
     STANDARD20_MODULE_STUFF,
     authn_dbd_cr_conf,

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c Sun Jun  6 16:59:50 2010
@@ -194,7 +194,7 @@ static void register_hooks(apr_pool_t *p
                               &authn_dbm_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_dbm_module =
+AP_DECLARE_MODULE(authn_dbm) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_dbm_dir_config, /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_file.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_file.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_file.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_file.c Sun Jun  6 16:59:50 2010
@@ -168,7 +168,7 @@ static void register_hooks(apr_pool_t *p
                               &authn_file_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authn_file_module =
+AP_DECLARE_MODULE(authn_file) =
 {
     STANDARD20_MODULE_STUFF,
     create_authn_file_dir_config,    /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Sun Jun  6 16:59:50 2010
@@ -1816,7 +1816,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_optional_fn_retrieve(ImportULDAPOptFn,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA authnz_ldap_module =
+AP_DECLARE_MODULE(authnz_ldap) =
 {
     STANDARD20_MODULE_STUFF,
     create_authnz_ldap_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Sun Jun  6 16:59:50 2010
@@ -805,7 +805,7 @@ static void register_hooks(apr_pool_t *p
                         AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_core_module =
+AP_DECLARE_MODULE(authz_core) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_core_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c Sun Jun  6 16:59:50 2010
@@ -342,7 +342,7 @@ static void authz_dbd_hooks(apr_pool_t *
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_dbd_module =
+AP_DECLARE_MODULE(authz_dbd) =
 {
     STANDARD20_MODULE_STUFF,
     authz_dbd_cr_cfg,

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c Sun Jun  6 16:59:50 2010
@@ -294,7 +294,7 @@ static void register_hooks(apr_pool_t *p
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_dbm_module =
+AP_DECLARE_MODULE(authz_dbm) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_dbm_dir_config, /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c Sun Jun  6 16:59:50 2010
@@ -288,7 +288,7 @@ static void register_hooks(apr_pool_t *p
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_groupfile_module =
+AP_DECLARE_MODULE(authz_groupfile) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_groupfile_dir_config,/* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_host.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_host.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_host.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_host.c Sun Jun  6 16:59:50 2010
@@ -255,7 +255,7 @@ static void register_hooks(apr_pool_t *p
                               &authz_all_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_host_module =
+AP_DECLARE_MODULE(authz_host) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_host_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_owner.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_owner.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_owner.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_owner.c Sun Jun  6 16:59:50 2010
@@ -179,7 +179,7 @@ static void register_hooks(apr_pool_t *p
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_owner_module =
+AP_DECLARE_MODULE(authz_owner) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                          /* dir config creater */

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_user.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_user.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_user.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_user.c Sun Jun  6 16:59:50 2010
@@ -102,7 +102,7 @@ static void register_hooks(apr_pool_t *p
                               AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA authz_user_module =
+AP_DECLARE_MODULE(authz_user) =
 {
     STANDARD20_MODULE_STUFF,
     create_authz_user_dir_config, /* dir config creater */

Modified: httpd/httpd/trunk/modules/arch/netware/mod_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/netware/mod_netware.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_netware.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_netware.c Sun Jun  6 16:59:50 2010
@@ -191,7 +191,7 @@ AP_INIT_TAKE23("CGIMapExtension", set_ex
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA netware_module = {
+AP_DECLARE_MODULE(netware) = {
    STANDARD20_MODULE_STUFF,
    create_netware_dir_config,     /* create per-dir config */
    merge_netware_dir_configs,     /* merge per-dir config */

Modified: httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c Sun Jun  6 16:59:50 2010
@@ -1263,7 +1263,7 @@ static void register_hooks(apr_pool_t *p
     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
 }
 
-module AP_MODULE_DECLARE_DATA nwssl_module =
+AP_DECLARE_MODULE(nwssl) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */

Modified: httpd/httpd/trunk/modules/arch/unix/mod_privileges.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_privileges.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_privileges.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_privileges.c Sun Jun  6 16:59:50 2010
@@ -577,7 +577,7 @@ static const command_rec privileges_cmds
 #endif
     {NULL}
 };
-module AP_MODULE_DECLARE_DATA privileges_module = {
+AP_DECLARE_MODULE(privileges) = {
     STANDARD20_MODULE_STUFF,
     privileges_create_dir_cfg,
     privileges_merge_dir_cfg,

Modified: httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.c Sun Jun  6 16:59:50 2010
@@ -357,7 +357,7 @@ static const command_rec unixd_cmds[] = 
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA unixd_module = {
+AP_DECLARE_MODULE(unixd) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,

Modified: httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_isapi.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_isapi.c Sun Jun  6 16:59:50 2010
@@ -1715,7 +1715,7 @@ static void isapi_hooks(apr_pool_t *cont
     ap_hook_handler(isapi_handler, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA isapi_module = {
+AP_DECLARE_MODULE(isapi) = {
    STANDARD20_MODULE_STUFF,
    create_isapi_dir_config,     /* create per-dir config */
    merge_isapi_dir_configs,     /* merge per-dir config */

Modified: httpd/httpd/trunk/modules/arch/win32/mod_win32.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_win32.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_win32.c (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_win32.c Sun Jun  6 16:59:50 2010
@@ -547,7 +547,7 @@ AP_INIT_TAKE1("ScriptInterpreterSource",
 { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA win32_module = {
+AP_DECLARE_MODULE(win32) = {
    STANDARD20_MODULE_STUFF,
    create_win32_dir_config,     /* create per-dir config */
    merge_win32_dir_configs,     /* merge per-dir config */

Modified: httpd/httpd/trunk/modules/cache/cache_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_cache.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_cache.c Sun Jun  6 16:59:50 2010
@@ -28,6 +28,8 @@
 #include <string.h>
 #endif
 
+APLOG_USE_MODULE(cache);
+
 struct cache_cache_t  {
     int             max_entries;
     apr_size_t      max_size;

Modified: httpd/httpd/trunk/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_storage.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.c Sun Jun  6 16:59:50 2010
@@ -16,6 +16,8 @@
 
 #include "mod_cache.h"
 
+APLOG_USE_MODULE(cache);
+
 extern APR_OPTIONAL_FN_TYPE(ap_cache_generate_key) *cache_generate_key;
 
 extern module AP_MODULE_DECLARE_DATA cache_module;

Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Sun Jun  6 16:59:50 2010
@@ -18,6 +18,8 @@
 
 #include <ap_provider.h>
 
+APLOG_USE_MODULE(cache);
+
 /* -------------------------------------------------------------- */
 
 extern APR_OPTIONAL_FN_TYPE(ap_cache_generate_key) *cache_generate_key;

Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Sun Jun  6 16:59:50 2010
@@ -1884,7 +1884,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_post_config(cache_post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA cache_module =
+AP_DECLARE_MODULE(cache) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                   /* create per-directory config structure */

Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Sun Jun  6 16:59:50 2010
@@ -1238,7 +1238,7 @@ static void disk_cache_register_hook(apr
                          &cache_disk_provider);
 }
 
-module AP_MODULE_DECLARE_DATA disk_cache_module = {
+AP_DECLARE_MODULE(disk_cache) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/cache/mod_file_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_file_cache.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_file_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_file_cache.c Sun Jun  6 16:59:50 2010
@@ -402,7 +402,7 @@ static void register_hooks(apr_pool_t *p
 
 }
 
-module AP_MODULE_DECLARE_DATA file_cache_module =
+AP_DECLARE_MODULE(file_cache) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                     /* create per-directory config structure */

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dbm.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dbm.c Sun Jun  6 16:59:50 2010
@@ -530,7 +530,7 @@ static void register_hooks(apr_pool_t *p
                          &socache_dbm);
 }
 
-module AP_MODULE_DECLARE_DATA socache_dbm_module = {
+AP_DECLARE_MODULE(socache_dbm) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dc.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dc.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dc.c Sun Jun  6 16:59:50 2010
@@ -182,7 +182,7 @@ static void register_hooks(apr_pool_t *p
                          &socache_dc);
 }
 
-module AP_MODULE_DECLARE_DATA socache_dc_module = {
+AP_DECLARE_MODULE(socache_dc) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks

Modified: httpd/httpd/trunk/modules/cache/mod_socache_memcache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_memcache.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_memcache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_memcache.c Sun Jun  6 16:59:50 2010
@@ -319,7 +319,7 @@ static void register_hooks(apr_pool_t *p
 #endif
 }
 
-module AP_MODULE_DECLARE_DATA socache_memcache_module = {
+AP_DECLARE_MODULE(socache_memcache) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks

Modified: httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c Sun Jun  6 16:59:50 2010
@@ -998,7 +998,7 @@ static void register_hooks(apr_pool_t *p
                          &socache_shmcb);
 }
 
-module AP_MODULE_DECLARE_DATA socache_shmcb_module = {
+AP_DECLARE_MODULE(socache_shmcb) = {
     STANDARD20_MODULE_STUFF,
     NULL, NULL, NULL, NULL, NULL,
     register_hooks

Modified: httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartbeat.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartbeat.c Sun Jun  6 16:59:50 2010
@@ -217,7 +217,7 @@ static const command_rec hb_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA heartbeat_module = {
+AP_DECLARE_MODULE(heartbeat) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c Sun Jun  6 16:59:50 2010
@@ -893,7 +893,7 @@ static const command_rec hm_cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA heartmonitor_module = {
+AP_DECLARE_MODULE(heartmonitor) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/core/mod_so.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_so.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_so.c (original)
+++ httpd/httpd/trunk/modules/core/mod_so.c Sun Jun  6 16:59:50 2010
@@ -422,7 +422,7 @@ static const command_rec so_cmds[] = {
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA so_module = {
+AP_DECLARE_MODULE(so) = {
    STANDARD20_MODULE_STUFF,
    NULL,                 /* create per-dir config */
    NULL,                 /* merge per-dir config */

Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.c Sun Jun  6 16:59:50 2010
@@ -669,7 +669,7 @@ static void wd_register_hooks(apr_pool_t
 /* the static hooks into our module from the other parts of the server.     */
 /*                                                                          */
 /*--------------------------------------------------------------------------*/
-AP_MODULE_DECLARE_DATA module watchdog_module = {
+AP_DECLARE_MODULE(watchdog) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure    */
     NULL,                       /* merge per-directory config structures    */

Modified: httpd/httpd/trunk/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/database/mod_dbd.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/database/mod_dbd.c (original)
+++ httpd/httpd/trunk/modules/database/mod_dbd.c Sun Jun  6 16:59:50 2010
@@ -980,7 +980,7 @@ static void dbd_hooks(apr_pool_t *pool)
     apr_dbd_init(pool);
 }
 
-module AP_MODULE_DECLARE_DATA dbd_module = {
+AP_DECLARE_MODULE(dbd) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,

Modified: httpd/httpd/trunk/modules/dav/fs/mod_dav_fs.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/fs/mod_dav_fs.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/fs/mod_dav_fs.c (original)
+++ httpd/httpd/trunk/modules/dav/fs/mod_dav_fs.c Sun Jun  6 16:59:50 2010
@@ -96,7 +96,7 @@ static void register_hooks(apr_pool_t *p
     dav_fs_register(p);
 }
 
-module AP_MODULE_DECLARE_DATA dav_fs_module =
+AP_DECLARE_MODULE(dav_fs) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                        /* dir config creater */

Modified: httpd/httpd/trunk/modules/dav/lock/mod_dav_lock.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/lock/mod_dav_lock.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/lock/mod_dav_lock.c (original)
+++ httpd/httpd/trunk/modules/dav/lock/mod_dav_lock.c Sun Jun  6 16:59:50 2010
@@ -92,7 +92,7 @@ static void register_hooks(apr_pool_t *p
                          &dav_hooks_locks_generic);
 }
 
-module AP_MODULE_DECLARE_DATA dav_lock_module =
+AP_DECLARE_MODULE(dav_lock) =
 {
     STANDARD20_MODULE_STUFF,
     dav_lock_create_dir_config,     /* dir config creater */

Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.c Sun Jun  6 16:59:50 2010
@@ -68,6 +68,8 @@
 /* used to denote that mod_dav will be handling this request */
 #define DAV_HANDLER_NAME "dav-handler"
 
+APLOG_USE_MODULE(dav);
+
 enum {
     DAV_ENABLED_UNSET = 0,
     DAV_ENABLED_OFF,

Modified: httpd/httpd/trunk/modules/dav/main/util_lock.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/util_lock.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/util_lock.c (original)
+++ httpd/httpd/trunk/modules/dav/main/util_lock.c Sun Jun  6 16:59:50 2010
@@ -31,6 +31,7 @@
 #include "http_protocol.h"
 #include "http_core.h"
 
+APLOG_USE_MODULE(dav);
 
 /* ---------------------------------------------------------------
 **

Modified: httpd/httpd/trunk/modules/debugging/mod_bucketeer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/mod_bucketeer.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/mod_bucketeer.c (original)
+++ httpd/httpd/trunk/modules/debugging/mod_bucketeer.c Sun Jun  6 16:59:50 2010
@@ -176,7 +176,7 @@ static const command_rec bucketeer_filte
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA bucketeer_module = {
+AP_DECLARE_MODULE(bucketeer) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,

Modified: httpd/httpd/trunk/modules/debugging/mod_dumpio.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/mod_dumpio.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/mod_dumpio.c (original)
+++ httpd/httpd/trunk/modules/debugging/mod_dumpio.c Sun Jun  6 16:59:50 2010
@@ -266,7 +266,7 @@ static const command_rec dumpio_cmds[] =
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA dumpio_module = {
+AP_DECLARE_MODULE(dumpio) = {
         STANDARD20_MODULE_STUFF,
         NULL,
         NULL,

Modified: httpd/httpd/trunk/modules/echo/mod_echo.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/echo/mod_echo.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/echo/mod_echo.c (original)
+++ httpd/httpd/trunk/modules/echo/mod_echo.c Sun Jun  6 16:59:50 2010
@@ -208,7 +208,7 @@ static void register_hooks(apr_pool_t *p
                                APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA echo_module = {
+AP_DECLARE_MODULE(echo) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/examples/mod_case_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_case_filter.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_case_filter.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_case_filter.c Sun Jun  6 16:59:50 2010
@@ -127,7 +127,7 @@ static void CaseFilterRegisterHooks(apr_
                               AP_FTYPE_RESOURCE);
     }
 
-module AP_MODULE_DECLARE_DATA case_filter_module =
+AP_DECLARE_MODULE(case_filter) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,

Modified: httpd/httpd/trunk/modules/examples/mod_case_filter_in.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_case_filter_in.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_case_filter_in.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_case_filter_in.c Sun Jun  6 16:59:50 2010
@@ -148,7 +148,7 @@ static void CaseFilterInRegisterHooks(ap
                              AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA case_filter_in_module =
+AP_DECLARE_MODULE(case_filter_in) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,

Modified: httpd/httpd/trunk/modules/examples/mod_example_hooks.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_example_hooks.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_example_hooks.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_example_hooks.c Sun Jun  6 16:59:50 2010
@@ -1511,7 +1511,7 @@ static const command_rec x_cmds[] =
  * Module definition for configuration.  If a particular callback is not
  * needed, replace its routine name below with the word NULL.
  */
-module AP_MODULE_DECLARE_DATA example_hooks_module =
+AP_DECLARE_MODULE(example_hooks) =
 {
     STANDARD20_MODULE_STUFF,
     x_create_dir_config,    /* per-directory config creator */

Modified: httpd/httpd/trunk/modules/examples/mod_example_ipc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_example_ipc.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_example_ipc.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_example_ipc.c Sun Jun  6 16:59:50 2010
@@ -354,7 +354,7 @@ static void exipc_register_hooks(apr_poo
 }
 
 /* Dispatch list for API hooks */
-module AP_MODULE_DECLARE_DATA example_ipc_module = {
+AP_DECLARE_MODULE(example_ipc) = {
     STANDARD20_MODULE_STUFF, 
     NULL,                  /* create per-dir    config structures */
     NULL,                  /* merge  per-dir    config structures */

Modified: httpd/httpd/trunk/modules/experimental/mod_noloris.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/experimental/mod_noloris.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/experimental/mod_noloris.c (original)
+++ httpd/httpd/trunk/modules/experimental/mod_noloris.c Sun Jun  6 16:59:50 2010
@@ -226,7 +226,7 @@ static const command_rec noloris_cmds[] 
             "Max connections in READ state to permit from an untrusted client"),
     {NULL}
 };
-module AP_MODULE_DECLARE_DATA noloris_module = {
+AP_DECLARE_MODULE(noloris) = {
     STANDARD20_MODULE_STUFF,
     NULL,
     NULL,

Modified: httpd/httpd/trunk/modules/filters/mod_buffer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_buffer.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_buffer.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_buffer.c Sun Jun  6 16:59:50 2010
@@ -331,7 +331,7 @@ static void register_hooks(apr_pool_t *p
             AP_FTYPE_CONTENT_SET);
 }
 
-module AP_MODULE_DECLARE_DATA buffer_module = {
+AP_DECLARE_MODULE(buffer) = {
     STANDARD20_MODULE_STUFF,
     create_buffer_config, /* create per-directory config structure */
     merge_buffer_config, /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/filters/mod_charset_lite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_charset_lite.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_charset_lite.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_charset_lite.c Sun Jun  6 16:59:50 2010
@@ -1157,7 +1157,7 @@ static void charset_register_hooks(apr_p
                              AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA charset_lite_module =
+AP_DECLARE_MODULE(charset_lite) =
 {
     STANDARD20_MODULE_STUFF,
     create_charset_dir_conf,

Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Sun Jun  6 16:59:50 2010
@@ -1388,7 +1388,7 @@ static const command_rec deflate_filter_
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA deflate_module = {
+AP_DECLARE_MODULE(deflate) = {
     STANDARD20_MODULE_STUFF,
     NULL,                         /* dir config creater */
     NULL,                         /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/filters/mod_ext_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ext_filter.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ext_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_ext_filter.c Sun Jun  6 16:59:50 2010
@@ -953,7 +953,7 @@ static int ef_input_filter(ap_filter_t *
     return rv;
 }
 
-module AP_MODULE_DECLARE_DATA ext_filter_module =
+AP_DECLARE_MODULE(ext_filter) =
 {
     STANDARD20_MODULE_STUFF,
     create_ef_dir_conf,

Modified: httpd/httpd/trunk/modules/filters/mod_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_filter.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_filter.c Sun Jun  6 16:59:50 2010
@@ -649,7 +649,7 @@ static const command_rec filter_cmds[] =
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA filter_module = {
+AP_DECLARE_MODULE(filter) = {
     STANDARD20_MODULE_STUFF,
     filter_config,
     filter_merge,

Modified: httpd/httpd/trunk/modules/filters/mod_include.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_include.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_include.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_include.c Sun Jun  6 16:59:50 2010
@@ -3308,7 +3308,7 @@ static void register_hooks(apr_pool_t *p
                               AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA include_module =
+AP_DECLARE_MODULE(include) =
 {
     STANDARD20_MODULE_STUFF,
     create_includes_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/filters/mod_ratelimit.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ratelimit.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ratelimit.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_ratelimit.c Sun Jun  6 16:59:50 2010
@@ -302,7 +302,7 @@ static void register_hooks(apr_pool_t *p
                               NULL, AP_FTYPE_PROTOCOL + 3);
 }
 
-module AP_MODULE_DECLARE_DATA ratelimit_module = {
+AP_DECLARE_MODULE(ratelimit) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/filters/mod_reflector.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reflector.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reflector.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reflector.c Sun Jun  6 16:59:50 2010
@@ -221,7 +221,7 @@ static const command_rec reflector_cmds[
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA reflector_module = {
+AP_DECLARE_MODULE(reflector) = {
     STANDARD20_MODULE_STUFF,
     create_reflector_dir_config,
     merge_reflector_dir_config,

Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Sun Jun  6 16:59:50 2010
@@ -542,7 +542,7 @@ static const command_rec reqtimeout_cmds
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA reqtimeout_module = {
+AP_DECLARE_MODULE(reqtimeout) = {
     STANDARD20_MODULE_STUFF,
     NULL,                           /* create per-dir config structures */
     NULL,                           /* merge  per-dir config structures */

Modified: httpd/httpd/trunk/modules/filters/mod_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_request.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_request.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_request.c Sun Jun  6 16:59:50 2010
@@ -595,7 +595,7 @@ static void register_hooks(apr_pool_t *p
     APR_REGISTER_OPTIONAL_FN(ap_request_remove_filter);
 }
 
-module AP_MODULE_DECLARE_DATA request_module = {
+AP_DECLARE_MODULE(request) = {
     STANDARD20_MODULE_STUFF,
     create_request_dir_config, /* create per-directory config structure */
     merge_request_dir_config,  /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/filters/mod_sed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_sed.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_sed.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_sed.c Sun Jun  6 16:59:50 2010
@@ -528,7 +528,7 @@ static void register_hooks(apr_pool_t *p
                              AP_FTYPE_RESOURCE);
 }
 
-module AP_MODULE_DECLARE_DATA sed_module = {
+AP_DECLARE_MODULE(sed) = {
     STANDARD20_MODULE_STUFF,
     create_sed_dir_config,      /* dir config creater */
     NULL,                       /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/filters/mod_substitute.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_substitute.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_substitute.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_substitute.c Sun Jun  6 16:59:50 2010
@@ -587,7 +587,7 @@ static const command_rec substitute_cmds
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA substitute_module = {
+AP_DECLARE_MODULE(substitute) = {
     STANDARD20_MODULE_STUFF,
     create_substitute_dcfg,     /* dir config creater */
     merge_substitute_dcfg,      /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/generators/mod_asis.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_asis.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_asis.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_asis.c Sun Jun  6 16:59:50 2010
@@ -113,7 +113,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_handler(asis_handler,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA asis_module =
+AP_DECLARE_MODULE(asis) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,              /* create per-directory config structure */

Modified: httpd/httpd/trunk/modules/generators/mod_autoindex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_autoindex.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_autoindex.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_autoindex.c Sun Jun  6 16:59:50 2010
@@ -2318,7 +2318,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_handler(handle_autoindex,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA autoindex_module =
+AP_DECLARE_MODULE(autoindex) =
 {
     STANDARD20_MODULE_STUFF,
     create_autoindex_config,    /* dir config creater */

Modified: httpd/httpd/trunk/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgi.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgi.c Sun Jun  6 16:59:50 2010
@@ -1266,7 +1266,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_post_config(cgi_post_config, aszPre, NULL, APR_HOOK_REALLY_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA cgi_module =
+AP_DECLARE_MODULE(cgi) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                        /* dir config creater */

Modified: httpd/httpd/trunk/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgid.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgid.c Sun Jun  6 16:59:50 2010
@@ -1857,7 +1857,7 @@ static void register_hook(apr_pool_t *p)
     ap_hook_handler(cgid_handler, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA cgid_module = {
+AP_DECLARE_MODULE(cgid) = {
     STANDARD20_MODULE_STUFF,
     NULL, /* dir config creater */
     NULL, /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/generators/mod_info.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_info.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_info.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_info.c Sun Jun  6 16:59:50 2010
@@ -801,7 +801,7 @@ static void register_hooks(apr_pool_t * 
     ap_hook_handler(display_info, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA info_module = {
+AP_DECLARE_MODULE(info) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
     NULL,                       /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/generators/mod_status.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_status.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_status.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_status.c Sun Jun  6 16:59:50 2010
@@ -827,7 +827,7 @@ static void register_hooks(apr_pool_t *p
 #endif
 }
 
-module AP_MODULE_DECLARE_DATA status_module =
+AP_DECLARE_MODULE(status) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */

Modified: httpd/httpd/trunk/modules/generators/mod_suexec.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_suexec.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_suexec.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_suexec.c Sun Jun  6 16:59:50 2010
@@ -125,7 +125,7 @@ static void suexec_hooks(apr_pool_t *p)
     ap_hook_post_config(suexec_post_config,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA suexec_module =
+AP_DECLARE_MODULE(suexec) =
 {
     STANDARD20_MODULE_STUFF,
     create_mconfig_for_directory,   /* create per-dir config */

Modified: httpd/httpd/trunk/modules/http/byterange_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/byterange_filter.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/byterange_filter.c (original)
+++ httpd/httpd/trunk/modules/http/byterange_filter.c Sun Jun  6 16:59:50 2010
@@ -54,6 +54,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 static int parse_byterange(char *range, apr_off_t clength,
                            apr_off_t *start, apr_off_t *end)
 {

Modified: httpd/httpd/trunk/modules/http/http_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_core.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_core.c (original)
+++ httpd/httpd/trunk/modules/http/http_core.c Sun Jun  6 16:59:50 2010
@@ -289,7 +289,7 @@ static void register_hooks(apr_pool_t *p
     ap_method_registry_init(p);
 }
 
-module AP_MODULE_DECLARE_DATA http_module = {
+AP_DECLARE_MODULE(http) = {
     STANDARD20_MODULE_STUFF,
     NULL,              /* create per-directory config structure */
     NULL,              /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Sun Jun  6 16:59:50 2010
@@ -55,6 +55,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 #define INVALID_CHAR -2
 
 static long get_chunk_size(char *);

Modified: httpd/httpd/trunk/modules/http/http_protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_protocol.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_protocol.c (original)
+++ httpd/httpd/trunk/modules/http/http_protocol.c Sun Jun  6 16:59:50 2010
@@ -58,6 +58,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 /* New Apache routine to map status codes into array indicies
  *  e.g.  100 -> 0,  101 -> 1,  200 -> 2 ...
  * The number of status lines must equal the value of RESPONSE_CODES (httpd.h)

Modified: httpd/httpd/trunk/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_request.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_request.c (original)
+++ httpd/httpd/trunk/modules/http/http_request.c Sun Jun  6 16:59:50 2010
@@ -49,6 +49,8 @@
 #include <stdarg.h>
 #endif
 
+APLOG_USE_MODULE(http);
+
 /*****************************************************************
  *
  * Mainline request processing...

Modified: httpd/httpd/trunk/modules/http/mod_mime.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/mod_mime.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/mod_mime.c (original)
+++ httpd/httpd/trunk/modules/http/mod_mime.c Sun Jun  6 16:59:50 2010
@@ -1000,7 +1000,7 @@ static void register_hooks(apr_pool_t *p
      */
 }
 
-module AP_MODULE_DECLARE_DATA mime_module = {
+AP_DECLARE_MODULE(mime) = {
     STANDARD20_MODULE_STUFF,
     create_mime_dir_config,     /* create per-directory config structure */
     merge_mime_dir_configs,     /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Sun Jun  6 16:59:50 2010
@@ -2960,7 +2960,7 @@ static void util_ldap_register_hooks(apr
     ap_hook_child_init(util_ldap_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA ldap_module = {
+AP_DECLARE_MODULE(ldap) = {
    STANDARD20_MODULE_STUFF,
    util_ldap_create_dir_config, /* create dir config */
    NULL,                        /* merge dir config */

Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c Sun Jun  6 16:59:50 2010
@@ -27,6 +27,8 @@
 #include "util_ldap_cache.h"
 #include <apr_strings.h>
 
+APLOG_USE_MODULE(ldap);
+
 #if APR_HAS_LDAP
 
 /* only here until strdup is gone */

Modified: httpd/httpd/trunk/modules/loggers/mod_log_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/mod_log_config.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/mod_log_config.c (original)
+++ httpd/httpd/trunk/modules/loggers/mod_log_config.c Sun Jun  6 16:59:50 2010
@@ -1560,7 +1560,7 @@ static void register_hooks(apr_pool_t *p
     APR_REGISTER_OPTIONAL_FN(ap_log_set_writer);
 }
 
-module AP_MODULE_DECLARE_DATA log_config_module =
+AP_DECLARE_MODULE(log_config) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-dir config */

Modified: httpd/httpd/trunk/modules/loggers/mod_log_forensic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/mod_log_forensic.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/mod_log_forensic.c (original)
+++ httpd/httpd/trunk/modules/loggers/mod_log_forensic.c Sun Jun  6 16:59:50 2010
@@ -277,7 +277,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_log_transaction(log_after,NULL,NULL,APR_HOOK_REALLY_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA log_forensic_module =
+AP_DECLARE_MODULE(log_forensic) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-dir config */

Modified: httpd/httpd/trunk/modules/loggers/mod_logio.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/mod_logio.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/mod_logio.c (original)
+++ httpd/httpd/trunk/modules/loggers/mod_logio.c Sun Jun  6 16:59:50 2010
@@ -191,7 +191,7 @@ static void register_hooks(apr_pool_t *p
     APR_REGISTER_OPTIONAL_FN(ap_logio_get_last_bytes);
 }
 
-module AP_MODULE_DECLARE_DATA logio_module =
+AP_DECLARE_MODULE(logio) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-dir config */

Modified: httpd/httpd/trunk/modules/lua/lua_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_config.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_config.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_config.c Sun Jun  6 16:59:50 2010
@@ -18,6 +18,8 @@
 #include "lua_config.h"
 #include "lua_vmprep.h"
 
+APLOG_USE_MODULE(lua);
+
 static ap_lua_dir_cfg *check_dir_config(lua_State *L, int index)
 {
     ap_lua_dir_cfg *cfg;

Modified: httpd/httpd/trunk/modules/lua/lua_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_request.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.c Sun Jun  6 16:59:50 2010
@@ -19,6 +19,8 @@
 #include "util_script.h"
 #include "lua_apr.h"
 
+APLOG_USE_MODULE(lua);
+
 typedef char *(*req_field_string_f) (request_rec * r);
 typedef int (*req_field_int_f) (request_rec * r);
 typedef apr_table_t *(*req_field_apr_table_f) (request_rec * r);

Modified: httpd/httpd/trunk/modules/lua/lua_vmprep.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_vmprep.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_vmprep.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_vmprep.c Sun Jun  6 16:59:50 2010
@@ -21,6 +21,8 @@
 #include "lua_config.h"
 #include "apr_file_info.h"
 
+APLOG_USE_MODULE(lua);
+
 /* forward dec'l from this file */
 
 #if 0

Modified: httpd/httpd/trunk/modules/lua/mod_lua.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.c (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.c Sun Jun  6 16:59:50 2010
@@ -1045,7 +1045,7 @@ static void lua_register_hooks(apr_pool_
                       APR_HOOK_REALLY_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA lua_module = {
+AP_DECLARE_MODULE(lua) = {
     STANDARD20_MODULE_STUFF,
     create_dir_config,          /* create per-dir    config structures */
     NULL,                       /* merge  per-dir    config structures */

Modified: httpd/httpd/trunk/modules/mappers/mod_actions.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_actions.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_actions.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_actions.c Sun Jun  6 16:59:50 2010
@@ -208,7 +208,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_handler(action_handler,NULL,NULL,APR_HOOK_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA actions_module =
+AP_DECLARE_MODULE(actions) =
 {
     STANDARD20_MODULE_STUFF,
     create_action_dir_config,   /* dir config creater */

Modified: httpd/httpd/trunk/modules/mappers/mod_alias.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_alias.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_alias.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_alias.c Sun Jun  6 16:59:50 2010
@@ -515,7 +515,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_fixups(fixup_redir,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA alias_module =
+AP_DECLARE_MODULE(alias) =
 {
     STANDARD20_MODULE_STUFF,
     create_alias_dir_config,       /* dir config creater */

Modified: httpd/httpd/trunk/modules/mappers/mod_dir.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_dir.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_dir.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_dir.c Sun Jun  6 16:59:50 2010
@@ -319,7 +319,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_fixups(fixup_dflt,NULL,NULL,APR_HOOK_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA dir_module = {
+AP_DECLARE_MODULE(dir) = {
     STANDARD20_MODULE_STUFF,
     create_dir_config,          /* create per-directory config structure */
     merge_dir_configs,          /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_imagemap.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_imagemap.c Sun Jun  6 16:59:50 2010
@@ -881,7 +881,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_handler(imap_handler,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA imagemap_module =
+AP_DECLARE_MODULE(imagemap) =
 {
     STANDARD20_MODULE_STUFF,
     create_imap_dir_config,     /* dir config creater */

Modified: httpd/httpd/trunk/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_negotiation.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_negotiation.c Sun Jun  6 16:59:50 2010
@@ -3221,7 +3221,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_handler(handle_map_file,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA negotiation_module =
+AP_DECLARE_MODULE(negotiation) =
 {
     STANDARD20_MODULE_STUFF,
     create_neg_dir_config,      /* dir config creator */

Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Sun Jun  6 16:59:50 2010
@@ -5031,7 +5031,7 @@ static void register_hooks(apr_pool_t *p
 }
 
     /* the main config structure */
-module AP_MODULE_DECLARE_DATA rewrite_module = {
+AP_DECLARE_MODULE(rewrite) = {
    STANDARD20_MODULE_STUFF,
    config_perdir_create,        /* create per-dir    config structures */
    config_perdir_merge,         /* merge  per-dir    config structures */

Modified: httpd/httpd/trunk/modules/mappers/mod_speling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_speling.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_speling.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_speling.c Sun Jun  6 16:59:50 2010
@@ -519,7 +519,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_fixups(check_speling,NULL,NULL,APR_HOOK_LAST);
 }
 
-module AP_MODULE_DECLARE_DATA speling_module =
+AP_DECLARE_MODULE(speling) =
 {
     STANDARD20_MODULE_STUFF,
     create_mconfig_for_directory,  /* create per-dir config */

Modified: httpd/httpd/trunk/modules/mappers/mod_userdir.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_userdir.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_userdir.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_userdir.c Sun Jun  6 16:59:50 2010
@@ -358,7 +358,7 @@ static void register_hooks(apr_pool_t *p
 #endif
 }
 
-module AP_MODULE_DECLARE_DATA userdir_module = {
+AP_DECLARE_MODULE(userdir) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
     NULL,                       /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c Sun Jun  6 16:59:50 2010
@@ -444,7 +444,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_translate_name(mva_translate, aszPre, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA vhost_alias_module =
+AP_DECLARE_MODULE(vhost_alias) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */

Modified: httpd/httpd/trunk/modules/metadata/mod_cern_meta.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_cern_meta.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_cern_meta.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_cern_meta.c Sun Jun  6 16:59:50 2010
@@ -359,7 +359,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_fixups(add_cern_meta_data,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA cern_meta_module =
+AP_DECLARE_MODULE(cern_meta) =
 {
     STANDARD20_MODULE_STUFF,
     create_cern_meta_dir_config, /* dir config creater */

Modified: httpd/httpd/trunk/modules/metadata/mod_env.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_env.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_env.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_env.c Sun Jun  6 16:59:50 2010
@@ -167,7 +167,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_fixups(fixup_env_module, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA env_module =
+AP_DECLARE_MODULE(env) =
 {
     STANDARD20_MODULE_STUFF,
     create_env_dir_config,      /* dir config creater */

Modified: httpd/httpd/trunk/modules/metadata/mod_expires.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_expires.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_expires.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_expires.c Sun Jun  6 16:59:50 2010
@@ -557,7 +557,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_insert_filter(expires_insert_filter, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA expires_module =
+AP_DECLARE_MODULE(expires) =
 {
     STANDARD20_MODULE_STUFF,
     create_dir_expires_config,  /* dir config creater */

Modified: httpd/httpd/trunk/modules/metadata/mod_headers.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_headers.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_headers.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_headers.c Sun Jun  6 16:59:50 2010
@@ -908,7 +908,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_post_read_request(ap_headers_early, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA headers_module =
+AP_DECLARE_MODULE(headers) =
 {
     STANDARD20_MODULE_STUFF,
     create_headers_dir_config,  /* dir config creater */

Modified: httpd/httpd/trunk/modules/metadata/mod_ident.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_ident.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_ident.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_ident.c Sun Jun  6 16:59:50 2010
@@ -332,7 +332,7 @@ static void register_hooks(apr_pool_t *p
     APR_REGISTER_OPTIONAL_FN(ap_ident_lookup);
 }
 
-module AP_MODULE_DECLARE_DATA ident_module =
+AP_DECLARE_MODULE(ident) =
 {
     STANDARD20_MODULE_STUFF,
     create_ident_dir_config,       /* dir config creater */

Modified: httpd/httpd/trunk/modules/metadata/mod_mime_magic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_mime_magic.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_mime_magic.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_mime_magic.c Sun Jun  6 16:59:50 2010
@@ -2463,7 +2463,7 @@ static void register_hooks(apr_pool_t *p
  * Apache API module interface
  */
 
-module AP_MODULE_DECLARE_DATA mime_magic_module =
+AP_DECLARE_MODULE(mime_magic) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                      /* dir config creator */

Modified: httpd/httpd/trunk/modules/metadata/mod_remoteip.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_remoteip.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_remoteip.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_remoteip.c Sun Jun  6 16:59:50 2010
@@ -478,7 +478,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_post_read_request(remoteip_modify_connection, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA remoteip_module = {
+AP_DECLARE_MODULE(remoteip) = {
     STANDARD20_MODULE_STUFF,
     NULL,                          /* create per-directory config structure */
     NULL,                          /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/metadata/mod_setenvif.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_setenvif.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_setenvif.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_setenvif.c Sun Jun  6 16:59:50 2010
@@ -643,7 +643,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_post_config(setenvif_post_config, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA setenvif_module =
+AP_DECLARE_MODULE(setenvif) =
 {
     STANDARD20_MODULE_STUFF,
     create_setenvif_config_dir, /* dir config creater */

Modified: httpd/httpd/trunk/modules/metadata/mod_unique_id.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_unique_id.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_unique_id.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_unique_id.c Sun Jun  6 16:59:50 2010
@@ -356,7 +356,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_post_read_request(gen_unique_id, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA unique_id_module = {
+AP_DECLARE_MODULE(unique_id) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
     NULL,                       /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/metadata/mod_usertrack.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_usertrack.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_usertrack.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_usertrack.c Sun Jun  6 16:59:50 2010
@@ -442,7 +442,7 @@ static void register_hooks(apr_pool_t *p
     ap_hook_fixups(spot_cookie,NULL,NULL,APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA usertrack_module = {
+AP_DECLARE_MODULE(usertrack) = {
     STANDARD20_MODULE_STUFF,
     make_cookie_dir,            /* dir config creater */
     NULL,                       /* dir merger --- default is to override */

Modified: httpd/httpd/trunk/modules/metadata/mod_version.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_version.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_version.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_version.c Sun Jun  6 16:59:50 2010
@@ -300,7 +300,7 @@ static const command_rec version_cmds[] 
     { NULL }
 };
 
-module AP_MODULE_DECLARE_DATA version_module =
+AP_DECLARE_MODULE(version) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,             /* dir config creater */

Modified: httpd/httpd/trunk/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_header.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_header.c Sun Jun  6 16:59:50 2010
@@ -17,6 +17,8 @@
 #include "ajp_header.h"
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
+
 static const char *response_trans_headers[] = {
     "Content-Type",
     "Content-Language",

Modified: httpd/httpd/trunk/modules/proxy/ajp_link.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_link.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_link.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_link.c Sun Jun  6 16:59:50 2010
@@ -16,6 +16,7 @@
 
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
 
 apr_status_t ajp_ilink_send(apr_socket_t *sock, ajp_msg_t *msg)
 {

Modified: httpd/httpd/trunk/modules/proxy/ajp_msg.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_msg.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_msg.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_msg.c Sun Jun  6 16:59:50 2010
@@ -16,6 +16,7 @@
 
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
 
 static char *hex_table = "0123456789ABCDEF";
 

Modified: httpd/httpd/trunk/modules/proxy/ajp_utils.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_utils.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_utils.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_utils.c Sun Jun  6 16:59:50 2010
@@ -16,6 +16,8 @@
 
 #include "ajp.h"
 
+APLOG_USE_MODULE(proxy_ajp);
+
 /*
  * Handle the CPING/CPONG
  */

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c Sun Jun  6 16:59:50 2010
@@ -128,7 +128,7 @@ static void register_hook(apr_pool_t *p)
     ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
 }
 
-module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module = {
+AP_DECLARE_MODULE(lbmethod_bybusyness) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c Sun Jun  6 16:59:50 2010
@@ -164,7 +164,7 @@ static void register_hook(apr_pool_t *p)
     ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests);
 }
 
-module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module = {
+AP_DECLARE_MODULE(lbmethod_byrequests) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c Sun Jun  6 16:59:50 2010
@@ -131,7 +131,7 @@ static void register_hook(apr_pool_t *p)
     ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic);
 }
 
-module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module = {
+AP_DECLARE_MODULE(lbmethod_bytraffic) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c Sun Jun  6 16:59:50 2010
@@ -476,7 +476,7 @@ static const command_rec cmds[] = {
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA lbmethod_heartbeat_module = {
+AP_DECLARE_MODULE(lbmethod_heartbeat) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c (original)
+++ httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c Sun Jun  6 16:59:50 2010
@@ -118,7 +118,7 @@ static void ap_proxy_rr_register_hook(ap
     ap_register_provider(p, PROXY_LBMETHOD, "roundrobin", "0", &roundrobin);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_balancer_rr_module = {
+AP_DECLARE_MODULE(proxy_balancer_rr) = {
     STANDARD20_MODULE_STUFF,
     NULL,       /* create per-directory config structure */
     NULL,       /* merge per-directory config structures */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Sun Jun  6 16:59:50 2010
@@ -2367,7 +2367,7 @@ static void register_hooks(apr_pool_t *p
 
 }
 
-module AP_MODULE_DECLARE_DATA proxy_module =
+AP_DECLARE_MODULE(proxy) =
 {
     STANDARD20_MODULE_STUFF,
     create_proxy_dir_config,    /* create per-directory config structure */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c Sun Jun  6 16:59:50 2010
@@ -724,7 +724,7 @@ static void ap_proxy_http_register_hook(
     proxy_hook_canon_handler(proxy_ajp_canon, NULL, NULL, APR_HOOK_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA proxy_ajp_module = {
+AP_DECLARE_MODULE(proxy_ajp) = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */

Re: svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

[Stefan Fritsch <sf...@sfritsch.de>]

On Tuesday 08 June 2010, Gregg L. Smith wrote:
> Yes, *only* in main.c which is the only problematic file.

Thanks, Gregg. I have removed the line from main.c in r952783.

Cheers,
Stefan

Re: svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

["Gregg L. Smith" <li...@glewis.com>]

Hi Stefan,

Yes, *only* in main.c which is the only problematic file.

The warning directly below causes me to suspect this is why we are 
seeing the problem in this one file alone.

#ifndef WIN32
APLOG_USE_MODULE(core);
#endif

/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
  *          extern functions and global data in another appropriate module.
  *
  * Most significant main() global data can be found in http_config.c
  */

Cheers,
Gregg


Stefan Fritsch wrote:
> Hi Gregg,
> 
> On Tuesday 08 June 2010, Gregg L. Smith wrote:
>> Sorry to say this still will not build and just changes the error
>> message.
>>
>> I however would like to see 2.3.6 out this week as well as
>> everyone  else. If worse comes to worse, #ifndef WIN32 around this
>> one line does allow apache to compile and run, and a quick testing
>> it seems to not be causing problems with normal logging. It may
>> not have the desired new functionality you are looking for but as
>> AFAIK this is still going to be under the alpha banner, so, no big
>> deal.
> 
> Thanks for testing.
> 
> Do you mean it works if you remove 
> - the one line only from main.c
> - APLOG_USE_MODULE(core) in all files where it appears
> - APLOG_USE_MODULE(...) in all files
> 
> But you are right, not having those lines does not cause any problems. 
> And I agree that we should just disable it if it threatens to delay 
> the alpha release.
> 
> If it only affects the core module, a possible fix may be to exploit 
> the fact that core_module always seems to have the module_index 0. 
> Though I would have to look at this in more detail.
> 
> Cheers,
> Stefan
> 

Re: svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

[Stefan Fritsch <sf...@sfritsch.de>]

Hi Gregg,

On Tuesday 08 June 2010, Gregg L. Smith wrote:
> Sorry to say this still will not build and just changes the error
> message.
> 
> I however would like to see 2.3.6 out this week as well as
> everyone  else. If worse comes to worse, #ifndef WIN32 around this
> one line does allow apache to compile and run, and a quick testing
> it seems to not be causing problems with normal logging. It may
> not have the desired new functionality you are looking for but as
> AFAIK this is still going to be under the alpha banner, so, no big
> deal.

Thanks for testing.

Do you mean it works if you remove 
- the one line only from main.c
- APLOG_USE_MODULE(core) in all files where it appears
- APLOG_USE_MODULE(...) in all files

But you are right, not having those lines does not cause any problems. 
And I agree that we should just disable it if it threatens to delay 
the alpha release.

If it only affects the core module, a possible fix may be to exploit 
the fact that core_module always seems to have the module_index 0. 
Though I would have to look at this in more detail.

Cheers,
Stefan

Re: svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

["Gregg L. Smith" <li...@glewis.com>]

Hi Stefan,

Sorry to say this still will not build and just changes the error message.

I however would like to see 2.3.6 out this week as well as everyone 
else. If worse comes to worse, #ifndef WIN32 around this one line
does allow apache to compile and run, and a quick testing it seems to 
not be causing problems with normal logging. It may not have the desired 
new functionality you are looking for but as AFAIK this is still going 
to be under the alpha banner, so, no big deal.

That said, I still have to wrap my head around the docs of the new 
functionality which I plan to do after the release. I can then see if it 
  does, does not or partially does work should I succeed in understand 
the new fuctionality. This would also takes some pressure off Bill to 
scramble up his patch as he mentioned. Simply note in the source above 
the workaround that it may not be correct but is a temporary workaround 
to allow the server to be compiled on Windows. Of course, this is your 
guy's call.

Regards,
Gregg


Stefan Fritsch wrote:
> Hi Gregg,
> 
> On Monday 07 June 2010, Gregg L. Smith wrote:
>> This seems to break trunk on Windows, prior revision builds fine.
> 
> I am not really familiar with the difference between AP_DECLARE_DATA 
> and AP_MODULE_DECLARE_DATA or any other Windows build pecularities. 
> Maybe the attached patch helps?
> 
> Cheers,
> Stefan

> William A. Rowe Jr. wrote:
>> On 6/7/2010 1:41 AM, Gregg L. Smith wrote:
>> Hi Stefan,
>> 
>> This seems to break trunk on Windows, prior revision builds fine.
>> 
>> --------------------Configuration: httpd - Win32
>> Release--------------------
>> Compiling resources...
>> Compiling...
>> main.c
>> E:\build\httpd-2.3.x-wrk\server\main.c(48) : warning C4273:
>> 'core_module' : inconsistent dll linkage.  dllexport assumed.
>> Linking...
>> main.obj : error LNK2001: unresolved external symbol _core_module
>> Release/httpd.exe : fatal error LNK1120: 1 unresolved externals
>>  
> I'll work up a patch when I finish my workday.

Re: svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

[Stefan Fritsch <sf...@sfritsch.de>]

Hi Gregg,

On Monday 07 June 2010, Gregg L. Smith wrote:
> This seems to break trunk on Windows, prior revision builds fine.

I am not really familiar with the difference between AP_DECLARE_DATA 
and AP_MODULE_DECLARE_DATA or any other Windows build pecularities. 
Maybe the attached patch helps?

Cheers,
Stefan

Re: svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

["William A. Rowe Jr." <wr...@rowe-clan.net>]

On 6/7/2010 1:41 AM, Gregg L. Smith wrote:
> Hi Stefan,
> 
> This seems to break trunk on Windows, prior revision builds fine.
> 
> --------------------Configuration: httpd - Win32
> Release--------------------
> Compiling resources...
> Compiling...
> main.c
> E:\build\httpd-2.3.x-wrk\server\main.c(48) : warning C4273:
> 'core_module' : inconsistent dll linkage.  dllexport assumed.
> Linking...
> main.obj : error LNK2001: unresolved external symbol _core_module
> Release/httpd.exe : fatal error LNK1120: 1 unresolved externals

I'll work up a patch when I finish my workday.

Re: svn commit: r951895 [1/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...

["Gregg L. Smith" <li...@glewis.com>]

Hi Stefan,

This seems to break trunk on Windows, prior revision builds fine.

--------------------Configuration: httpd - Win32 Release--------------------
Compiling resources...
Compiling...
main.c
E:\build\httpd-2.3.x-wrk\server\main.c(48) : warning C4273: 
'core_module' : inconsistent dll linkage.  dllexport assumed.
Linking...
main.obj : error LNK2001: unresolved external symbol _core_module
Release/httpd.exe : fatal error LNK1120: 1 unresolved externals
Error executing link.exe.

Regards,
Gregg


sf@apache.org wrote:
> Author: sf
> Date: Sun Jun  6 16:59:50 2010
> New Revision: 951895
> 
> URL: http://svn.apache.org/viewvc?rev=951895&view=rev
> Log:
> Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
> advantage of per-module loglevels
> 
> Modified:
> ...
>     httpd/httpd/trunk/server/main.c
>...
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=951895&r1=951894&r2=951895&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/main.c (original)
> +++ httpd/httpd/trunk/server/main.c Sun Jun  6 16:59:50 2010
> @@ -45,6 +45,8 @@
>  #include <unistd.h>
>  #endif
>  
> +APLOG_USE_MODULE(core);
> +
>  /* WARNING: Win32 binds http_main.c dynamically to the server. Please place
>   *          extern functions and global data in another appropriate module.
>   *
>