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 /server/mpm/prefork | |
| 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 'server/mpm/prefork')
| -rw-r--r-- | server/mpm/prefork/prefork.c | 4 | ||||
| -rw-r--r-- | server/mpm/prefork/scoreboard.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 2d5a249864..755b10571f 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -172,7 +172,7 @@ int tpf_child = 0; char tpf_server_name[INETD_SERVNAME_LENGTH+1]; #endif /* TPF */ -API_VAR_EXPORT scoreboard *ap_scoreboard_image = NULL; +API_EXPORT_VAR scoreboard *ap_scoreboard_image = NULL; static new_scoreboard *ap_new_scoreboard_image = NULL; #ifdef GPROF @@ -2434,7 +2434,7 @@ LISTEN_COMMANDS { NULL } }; -module MODULE_VAR_EXPORT mpm_prefork_module = { +module MODULE_EXPORT_VAR mpm_prefork_module = { MPM20_MODULE_STUFF, prefork_pre_config, /* run hook before the configuration is read */ NULL, /* create per-directory config structure */ diff --git a/server/mpm/prefork/scoreboard.h b/server/mpm/prefork/scoreboard.h index fe4c2589f1..c370f01823 100644 --- a/server/mpm/prefork/scoreboard.h +++ b/server/mpm/prefork/scoreboard.h @@ -214,9 +214,9 @@ typedef struct { API_EXPORT(void) ap_sync_scoreboard_image(void); API_EXPORT(int) ap_exists_scoreboard_image(void); -API_VAR_EXPORT extern scoreboard *ap_scoreboard_image; +API_EXPORT_VAR extern scoreboard *ap_scoreboard_image; -API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation; +API_EXPORT_VAR extern ap_generation_t volatile ap_my_generation; /* for time_process_request() in http_main.c */ #define START_PREQUEST 1 |