From 86e2a18f2a9143d5d1c3de39dc6fd1398057bdde Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 27 May 2000 05:28:02 +0000 Subject: 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 --- modules/generators/mod_status.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/generators/mod_status.c') diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c index 75009a5f20..19e44d996e 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -68,7 +68,7 @@ #define STATUS_MAGIC_TYPE "application/x-httpd-status" -module MODULE_VAR_EXPORT status_module; +module MODULE_EXPORT_VAR status_module; static int print_status_value(void *data, const char *key, const char *val) { @@ -127,7 +127,7 @@ static const handler_rec status_handlers[] = {NULL} }; -module MODULE_VAR_EXPORT status_module = +module MODULE_EXPORT_VAR status_module = { STANDARD20_MODULE_STUFF, NULL, /* create per-dir config */ -- cgit v1.2.3