diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2000-05-27 07:28:02 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2000-05-27 07:28:02 +0200 |
| commit | 86e2a18f2a9143d5d1c3de39dc6fd1398057bdde (patch) | |
| tree | bd244d5ab1a211cfb57b07ba0dd323abaf53a3c1 /modules/loggers/mod_log_config.c | |
| parent | fixes some compilation errors (macros, function params, etc). also shifts (diff) | |
| download | apache2-86e2a18f2a9143d5d1c3de39dc6fd1398057bdde.tar.xz apache2-86e2a18f2a9143d5d1c3de39dc6fd1398057bdde.zip | |
This patch corrects the issues from the AP_EXPORT and linkage
specification arguments to the ap_hooks.h declarations. As with
the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.
I will be happy to revert the inclusion of ap_config.h from
httpd.h if this bothers anyone. More individual modules need
to be patched if we do so.
The API_EXPORTs all moved into central storage in the ap_config.h
header. Without WIN32 or API_STATIC compile time declarations,
these macros remain no-ops.
This patch also moves the following data from http_main to http_config:
const char *ap_server_argv0;
const char *ap_server_root;
ap_array_header_t *ap_server_pre_read_config;
ap_array_header_t *ap_server_post_read_config;
ap_array_header_t *ap_server_config_defines;
And the following variables had already moved into ap_hooks.c:
ap_pool_t *g_pHookPool; (initialized now in http_config)
int g_bDebugHooks; (out of http_config)
const char *g_szCurrentHookName; (out of http_config)
The changes to http_main.c are in preparation for that module to
move out to a seperate .exe for win32. Other platforms will be
unaffected, outside of these changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85309 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/loggers/mod_log_config.c')
| -rw-r--r-- | modules/loggers/mod_log_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index 0727189941..a2dee51aa9 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -180,7 +180,7 @@ #include <limits.h> #endif -module MODULE_VAR_EXPORT config_log_module; +module MODULE_EXPORT_VAR config_log_module; static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE); static ap_fileperms_t xfer_perms = APR_OS_DEFAULT; @@ -1143,7 +1143,7 @@ static void register_hooks(void) ap_hook_log_transaction(multi_log_transaction,NULL,NULL,AP_HOOK_MIDDLE); } -module MODULE_VAR_EXPORT config_log_module = +module MODULE_EXPORT_VAR config_log_module = { STANDARD20_MODULE_STUFF, NULL, /* create per-dir config */ |