1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92805 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2002-01-10 09:11:33 +00:00
parent aff1454d34
commit 30d1548be6
16 changed files with 26 additions and 25 deletions

View File

@@ -164,7 +164,7 @@ static const command_rec db_auth_cmds[] =
{NULL}
};
module auth_db_module;
module AP_MODULE_DECLARE_DATA auth_db_module;
static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
{
@@ -406,7 +406,7 @@ static void register_hooks(apr_pool_t *p)
ap_hook_auth_checker(db_check_auth, NULL, NULL, APR_HOOK_MIDDLE);
}
module auth_db_module =
module AP_MODULE_DECLARE_DATA auth_db_module =
{
STANDARD20_MODULE_STUFF,
create_db_auth_dir_config, /* dir config creater */

View File

@@ -108,7 +108,7 @@
define this to conform */
#define RELAX_HEADER_RULE
module isapi_module;
module AP_MODULE_DECLARE_DATA isapi_module;
/* Declare the ISAPI functions */
@@ -1279,7 +1279,7 @@ AP_INIT_ITERATE("ISAPICacheFile", isapi_cmd_cachefile, NULL, RSRC_CONF,
{ NULL }
};
module isapi_module = {
module AP_MODULE_DECLARE_DATA isapi_module = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config */
NULL, /* merge per-dir config */

View File

@@ -64,7 +64,8 @@
#include "apr_buckets.h"
#include "util_filter.h"
AP_DECLARE_DATA module echo_module;
module AP_MODULE_DECLARE_DATA echo_module;
typedef struct {
int bEnabled;
@@ -133,7 +134,7 @@ static void register_hooks(apr_pool_t *p)
APR_HOOK_MIDDLE);
}
AP_DECLARE_DATA module echo_module = {
module AP_MODULE_DECLARE_DATA echo_module = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */

View File

@@ -66,7 +66,7 @@ APR_HOOK_STRUCT(
APR_HOOK_LINK(open_entity)
)
AP_DECLARE_DATA extern module cache_module;
extern module AP_MODULE_DECLARE_DATA cache_module;
/* -------------------------------------------------------------- */

View File

@@ -10,7 +10,7 @@
#include <ctype.h>
static const char s_szCaseFilterName[]="CaseFilter";
module case_filter_module;
module AP_MODULE_DECLARE_DATA case_filter_module;
typedef struct
{
@@ -103,7 +103,7 @@ static void CaseFilterRegisterHooks(apr_pool_t *p)
AP_FTYPE_CONTENT);
}
module case_filter_module =
module AP_MODULE_DECLARE_DATA case_filter_module =
{
STANDARD20_MODULE_STUFF,
NULL,

View File

@@ -151,7 +151,7 @@ typedef struct charset_req_t {
* each request */
#define DBGLVL_PMC 2 /* messages about possible misconfiguration */
module charset_lite_module;
module AP_MODULE_DECLARE_DATA charset_lite_module;
static void *create_charset_dir_conf(apr_pool_t *p,char *dummy)
{
@@ -1113,7 +1113,7 @@ static void charset_register_hooks(apr_pool_t *p)
AP_FTYPE_CONTENT);
}
module charset_lite_module =
module AP_MODULE_DECLARE_DATA charset_lite_module =
{
STANDARD20_MODULE_STUFF,
create_charset_dir_conf,

View File

@@ -143,7 +143,7 @@ static apr_pool_t *x_subpool = NULL;
* Declare ourselves so the configuration routines can find and know us.
* We'll fill it in at the end of the module.
*/
AP_DECLARE_DATA module example_module;
module AP_MODULE_DECLARE_DATA example_module;
/*--------------------------------------------------------------------------*/
/* */
@@ -1329,7 +1329,7 @@ static const handler_rec x_handlers[] =
* Module definition for configuration. If a particular callback is not
* needed, replace its routine name below with the word NULL.
*/
AP_DECLARE_DATA module example_module =
AP_DECLARE_DATA AP_MODULE_DECLARE_DATA module example_module =
{
STANDARD20_MODULE_STUFF,
x_create_dir_config, /* per-directory config creator */

View File

@@ -108,7 +108,7 @@ typedef struct ef_ctx_t {
#endif
} ef_ctx_t;
module ext_filter_module;
module AP_MODULE_DECLARE_DATA ext_filter_module;
static apr_status_t ef_output_filter(ap_filter_t *, apr_bucket_brigade *);
@@ -782,7 +782,7 @@ static int ef_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
}
#endif
module ext_filter_module =
module AP_MODULE_DECLARE_DATA ext_filter_module =
{
STANDARD20_MODULE_STUFF,
create_ef_dir_conf,

View File

@@ -320,7 +320,7 @@ static void register_hooks(apr_pool_t *p)
AP_FTYPE_HTTP_HEADER);
}
AP_DECLARE_DATA module http_module = {
module AP_MODULE_DECLARE_DATA http_module = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */

View File

@@ -97,7 +97,7 @@ typedef struct {
*/
} action_dir_config;
module actions_module;
module AP_MODULE_DECLARE_DATA actions_module;
static void *create_action_dir_config(apr_pool_t *p, char *dummy)
{
@@ -226,7 +226,7 @@ static void register_hooks(apr_pool_t *p)
ap_hook_handler(action_handler,NULL,NULL,APR_HOOK_LAST);
}
module actions_module =
module AP_MODULE_DECLARE_DATA actions_module =
{
STANDARD20_MODULE_STUFF,
create_action_dir_config, /* dir config creater */

View File

@@ -94,7 +94,7 @@
* Activate it with "CheckSpelling On"
*/
AP_MODULE_DECLARE_DATA module speling_module;
module AP_MODULE_DECLARE_DATA speling_module;
typedef struct {
int enabled;

View File

@@ -120,7 +120,7 @@
#define DEFAULT_USER_DIR "public_html"
#endif
module userdir_module;
module AP_MODULE_DECLARE_DATA userdir_module;
typedef struct {
int globally_disabled;
@@ -388,7 +388,7 @@ static void register_hooks(apr_pool_t *p)
#endif
}
module userdir_module = {
module AP_MODULE_DECLARE_DATA userdir_module = {
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */

View File

@@ -74,7 +74,7 @@ static void ExportRegisterHooks(apr_pool_t *p)
APR_REGISTER_OPTIONAL_FN(TestOptionalFn);
}
module optional_fn_export_module=
module AP_MODULE_DECLARE_DATA optional_fn_export_module=
{
STANDARD20_MODULE_STUFF,
NULL,

View File

@@ -81,7 +81,7 @@ static void ImportRegisterHooks(apr_pool_t *p)
ap_hook_optional_fn_retrieve(ImportFnRetrieve,NULL,NULL,APR_HOOK_MIDDLE);
}
module optional_fn_import_module =
module AP_MODULE_DECLARE_DATA optional_fn_import_module =
{
STANDARD20_MODULE_STUFF,
NULL,

View File

@@ -70,7 +70,7 @@ static void ExportRegisterHooks(apr_pool_t *p)
ap_hook_log_transaction(ExportLogTransaction,NULL,NULL,APR_HOOK_MIDDLE);
}
module optional_hook_export_module =
module AP_MODULE_DECLARE_DATA optional_hook_export_module =
{
STANDARD20_MODULE_STUFF,
NULL,

View File

@@ -71,7 +71,7 @@ static void ImportRegisterHooks(apr_pool_t *p)
NULL,APR_HOOK_MIDDLE);
}
module optional_hook_import_module=
module AP_MODULE_DECLARE_DATA optional_hook_import_module=
{
STANDARD20_MODULE_STUFF,
NULL,