summaryrefslogtreecommitdiffstats
path: root/modules/echo/mod_echo.c
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2000-05-27 07:28:02 +0200
committerWilliam A. Rowe Jr <wrowe@apache.org>2000-05-27 07:28:02 +0200
commit86e2a18f2a9143d5d1c3de39dc6fd1398057bdde (patch)
treebd244d5ab1a211cfb57b07ba0dd323abaf53a3c1 /modules/echo/mod_echo.c
parentfixes some compilation errors (macros, function params, etc). also shifts (diff)
downloadapache2-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/echo/mod_echo.c')
-rw-r--r--modules/echo/mod_echo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index 752a0dd1e5..f635ff5688 100644
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -62,7 +62,7 @@
#include "http_config.h"
#include "http_connection.h"
-API_VAR_EXPORT module echo_module;
+API_EXPORT_VAR module echo_module;
typedef struct
{
@@ -121,7 +121,7 @@ static void register_hooks(void)
ap_hook_process_connection(process_echo_connection,NULL,NULL,AP_HOOK_MIDDLE);
}
-API_VAR_EXPORT module echo_module = {
+API_EXPORT_VAR module echo_module = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */