From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 27 May 2000 22:40:44 +0000 (+0000)
Subject: PR:
X-Git-Tag: APACHE_2_0_ALPHA_4~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da493b8be15e831bbbefbe28826f90163f430bbd;p=apache

PR:
Obtained from:
Submitted by:
Reviewed by:

  Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT
  names for linkage (API_, CORE_, and MODULE_).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85318 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_config.h b/include/ap_config.h
index 669de70d7d..2f0a8a3cac 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -61,30 +61,30 @@
  *
  *   API_EXPORT(type)        for functions bound in the apache core, except:
  *   API_EXPORT_NONSTD(type) for functions with var args (only as ...)
- *   API_EXPORT_VAR          for data residing in the core
- *   MODULE_EXPORT_VAR       is a hack that will need to go away
+ *   API_VAR_EXPORT          for data residing in the core
+ *   MODULE_VAR_EXPORT       is a hack that will need to go away
  */
 
 #if !defined(WIN32)
 #define API_EXPORT(type)        type
 #define API_EXPORT_NONSTD(type) type
-#define API_EXPORT_VAR
-#define MODULE_EXPORT_VAR
+#define API_VAR_EXPORT
+#define MODULE_VAR_EXPORT
 #elif defined(API_STATIC)
 #define API_EXPORT(type)        type __stdcall
 #define API_EXPORT_NONSTD(type) type
-#define API_EXPORT_VAR
-#define MODULE_EXPORT_VAR
+#define API_VAR_EXPORT
+#define MODULE_VAR_EXPORT
 #elif defined(API_EXPORT_SYMBOLS)
 #define API_EXPORT(type)        __declspec(dllexport) type __stdcall
 #define API_EXPORT_NONSTD(type) __declspec(dllexport) type
-#define API_EXPORT_VAR		__declspec(dllexport)
-#define MODULE_EXPORT_VAR       __declspec(dllexport)
+#define API_VAR_EXPORT		__declspec(dllexport)
+#define MODULE_VAR_EXPORT       __declspec(dllexport)
 #else
 #define API_EXPORT(type)        __declspec(dllimport) type __stdcall
 #define API_EXPORT_NONSTD(type) __declspec(dllimport) type
-#define API_EXPORT_VAR		__declspec(dllimport)
-#define MODULE_EXPORT_VAR       __declspec(dllexport)
+#define API_VAR_EXPORT		__declspec(dllimport)
+#define MODULE_VAR_EXPORT       __declspec(dllexport)
 #endif
 
 #ifdef __cplusplus
diff --git a/include/http_config.h b/include/http_config.h
index 4b83080d70..94f9dd8483 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -366,11 +366,11 @@ API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden
 
 #ifdef CORE_PRIVATE
 
-extern API_EXPORT_VAR module *top_module;
+extern API_VAR_EXPORT module *top_module;
 
 extern module *ap_prelinked_modules[];
 extern module *ap_preloaded_modules[];
-extern API_EXPORT_VAR module **ap_loaded_modules;
+extern API_VAR_EXPORT module **ap_loaded_modules;
 
 /* For mod_so.c... */
 
diff --git a/include/http_core.h b/include/http_core.h
index b479edf2b2..71ad9536f0 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -176,7 +176,7 @@ API_EXPORT(file_type_e) ap_get_win32_interpreter(const request_rec *, char **);
 
 char *ap_response_code_string (request_rec *r, int error_index);
 
-extern API_EXPORT_VAR module core_module;
+extern API_VAR_EXPORT module core_module;
 
 /* Per-directory configuration */
 
diff --git a/include/http_main.h b/include/http_main.h
index 09b3f07240..9c563627b3 100644
--- a/include/http_main.h
+++ b/include/http_main.h
@@ -63,13 +63,13 @@
 extern "C" {
 #endif
 
-extern API_EXPORT_VAR const char *ap_server_argv0;
-extern API_EXPORT_VAR const char *ap_server_root;
+extern API_VAR_EXPORT const char *ap_server_argv0;
+extern API_VAR_EXPORT const char *ap_server_root;
 
 /* for -C, -c and -D switches */
-extern API_EXPORT_VAR ap_array_header_t *ap_server_pre_read_config;
-extern API_EXPORT_VAR ap_array_header_t *ap_server_post_read_config;
-extern API_EXPORT_VAR ap_array_header_t *ap_server_config_defines;
+extern API_VAR_EXPORT ap_array_header_t *ap_server_pre_read_config;
+extern API_VAR_EXPORT ap_array_header_t *ap_server_post_read_config;
+extern API_VAR_EXPORT ap_array_header_t *ap_server_config_defines;
 
 #ifdef __cplusplus
 }
diff --git a/include/httpd.h b/include/httpd.h
index be6216bb2d..67453b41e9 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -890,11 +890,11 @@ struct server_rec {
 #define API_EXPORT_NONSTD(type)    type
 #endif
 
-#ifndef MODULE_EXPORT_VAR
-#define MODULE_EXPORT_VAR
+#ifndef MODULE_VAR_EXPORT
+#define MODULE_VAR_EXPORT
 #endif
-#ifndef API_EXPORT_VAR
-#define API_EXPORT_VAR
+#ifndef API_VAR_EXPORT
+#define API_VAR_EXPORT
 #endif
 
 /* modules should not used functions marked CORE_EXPORT
diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c
index f73c45f62e..78c669f66f 100644
--- a/modules/aaa/mod_access.c
+++ b/modules/aaa/mod_access.c
@@ -105,7 +105,7 @@ typedef struct {
     ap_array_header_t *denys;
 } access_dir_conf;
 
-module MODULE_EXPORT_VAR access_module;
+module MODULE_VAR_EXPORT access_module;
 
 static void *create_access_dir_config(ap_pool_t *p, char *dummy)
 {
@@ -395,7 +395,7 @@ static void register_hooks(void)
     ap_hook_access_checker(check_dir_access,NULL,NULL,AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR access_module =
+module MODULE_VAR_EXPORT access_module =
 {
     STANDARD20_MODULE_STUFF,
     create_access_dir_config,	/* dir config creater */
diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c
index 657eeb56be..4a6de2f02d 100644
--- a/modules/aaa/mod_auth.c
+++ b/modules/aaa/mod_auth.c
@@ -118,7 +118,7 @@ static const command_rec auth_cmds[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR auth_module;
+module MODULE_VAR_EXPORT auth_module;
 
 static char *get_pw(request_rec *r, char *user, char *auth_pwfile)
 {
@@ -321,7 +321,7 @@ static void register_hooks(void)
     ap_hook_auth_checker(check_user_access,NULL,NULL,AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR auth_module =
+module MODULE_VAR_EXPORT auth_module =
 {
     STANDARD20_MODULE_STUFF,
     create_auth_dir_config,	/* dir config creater */
diff --git a/modules/aaa/mod_auth_anon.c b/modules/aaa/mod_auth_anon.c
index 89b00ab008..3a786d007f 100644
--- a/modules/aaa/mod_auth_anon.c
+++ b/modules/aaa/mod_auth_anon.c
@@ -210,7 +210,7 @@ static const command_rec anon_auth_cmds[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR auth_anon_module;
+module MODULE_VAR_EXPORT auth_anon_module;
 
 static int anon_authenticate_basic_user(request_rec *r)
 {
@@ -295,7 +295,7 @@ static void register_hooks(void)
     ap_hook_auth_checker(check_anon_access,NULL,NULL,AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR auth_anon_module =
+module MODULE_VAR_EXPORT auth_anon_module =
 {
     STANDARD20_MODULE_STUFF,
     create_anon_auth_dir_config,/* dir config creater */
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 39a44fa3da..4ad04a3f20 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -214,7 +214,7 @@ static ap_time_t     *otn_counter;	/* one-time-nonce counter */
 static void          *client_mm = NULL;
 #endif	/* HAVE_SHMEM_MM */
 
-module MODULE_EXPORT_VAR auth_digest_module;
+module MODULE_VAR_EXPORT auth_digest_module;
 
 /*
  * initialization code
@@ -1876,7 +1876,7 @@ static void register_hooks(void)
     ap_hook_fixups(add_auth_info, NULL, NULL, AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR auth_digest_module =
+module MODULE_VAR_EXPORT auth_digest_module =
 {
     STANDARD20_MODULE_STUFF,
     create_digest_dir_config,	/* dir config creater */
diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index af2edfb2e2..1326e56c67 100644
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -126,7 +126,7 @@
 #include "http_core.h"
 #include "apr_mmap.h"
 
-module MODULE_EXPORT_VAR file_cache_module;
+module MODULE_VAR_EXPORT file_cache_module;
 static ap_pool_t *context;
 static int once_through = 0;
 
@@ -359,7 +359,7 @@ static int file_cache_xlat(request_rec *r)
  * This is really broken on Windows. The call to get the core_module config
  * in core_translate_copy seg faults because 'core_module' is not exported 
  * properly and needs a thunk.
- * Will be fixed when we get API_EXPORT_VARS working correctly again    
+ * Will be fixed when we get API_VAR_EXPORTS working correctly again    
  */
     return DECLINED;
 #endif
@@ -523,7 +523,7 @@ static const handler_rec file_cache_handlers[] =
     { NULL }
 };
 
-module MODULE_EXPORT_VAR file_cache_module =
+module MODULE_VAR_EXPORT file_cache_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                     /* create per-directory config structure */
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index f635ff5688..752a0dd1e5 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_EXPORT_VAR module echo_module;
+API_VAR_EXPORT 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_EXPORT_VAR module echo_module = {
+API_VAR_EXPORT module echo_module = {
     STANDARD20_MODULE_STUFF,
     NULL,			/* create per-directory config structure */
     NULL,			/* merge per-directory config structures */
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index cfc6b7fcae..dbfa41ad8f 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -113,7 +113,7 @@
 #define RAW_ASCII_CHAR(ch)  (ch)
 #endif /*CHARSET_EBCDIC*/
 
-module MODULE_EXPORT_VAR includes_module;
+module MODULE_VAR_EXPORT includes_module;
 
 /* just need some arbitrary non-NULL pointer which can't also be a request_rec */
 #define NESTED_INCLUDE_MAGIC	(&includes_module)
@@ -2502,7 +2502,7 @@ static const handler_rec includes_handlers[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR includes_module =
+module MODULE_VAR_EXPORT includes_module =
 {
     STANDARD20_MODULE_STUFF,
     create_includes_dir_config, /* dir config creater */
diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c
index 603f67362d..4466e9c00c 100644
--- a/modules/generators/mod_asis.c
+++ b/modules/generators/mod_asis.c
@@ -126,7 +126,7 @@ static const handler_rec asis_handlers[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR asis_module =
+module MODULE_VAR_EXPORT asis_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,			/* create per-directory config structure */
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 0631b14d4c..83ed302321 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -81,7 +81,7 @@
 #include <string.h>
 #endif
 
-module MODULE_EXPORT_VAR autoindex_module;
+module MODULE_VAR_EXPORT autoindex_module;
 
 /****************************************************************
  *
@@ -1680,7 +1680,7 @@ static const handler_rec autoindex_handlers[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR autoindex_module =
+module MODULE_VAR_EXPORT autoindex_module =
 {
     STANDARD20_MODULE_STUFF,
     create_autoindex_config,	/* dir config creater */
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 2899fa3598..4ab25957c3 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -86,7 +86,7 @@
 #include <string.h>
 #endif
 
-module MODULE_EXPORT_VAR cgi_module;
+module MODULE_VAR_EXPORT cgi_module;
 
 /* KLUDGE --- for back-combatibility, we don't have to check ExecCGI
  * in ScriptAliased directories, which means we need to know if this
@@ -657,7 +657,7 @@ static const handler_rec cgi_handlers[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR cgi_module =
+module MODULE_VAR_EXPORT cgi_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,			/* dir config creater */
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 6755ad170e..e8f932745b 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -102,7 +102,7 @@ struct sockaddr_un {
 #endif
 
 
-module MODULE_EXPORT_VAR cgid_module; 
+module MODULE_VAR_EXPORT cgid_module; 
 
 static void cgid_init(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *main_server); 
 static int once_through = 0; 
@@ -999,7 +999,7 @@ static void register_hook(void)
     ap_hook_post_config(cgid_init, NULL, NULL, AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR cgid_module = { 
+module MODULE_VAR_EXPORT cgid_module = { 
     STANDARD20_MODULE_STUFF, 
     NULL, /* dir config creater */ 
     NULL, /* dir merger --- default is to override */ 
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index a1517df3dc..c5dda74bbc 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -103,7 +103,7 @@ typedef struct info_cfg_lines {
     struct info_cfg_lines *next;
 } info_cfg_lines;
 
-module MODULE_EXPORT_VAR info_module;
+module MODULE_VAR_EXPORT info_module;
 extern module *top_module;
 
 static void *create_info_config(ap_pool_t *p, server_rec *s)
@@ -661,7 +661,7 @@ static const handler_rec info_handlers[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR info_module =
+module MODULE_VAR_EXPORT info_module =
 {
     STANDARD_MODULE_STUFF,
     NULL,                       /* initializer */
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 19e44d996e..75009a5f20 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_EXPORT_VAR status_module;
+module MODULE_VAR_EXPORT 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_EXPORT_VAR status_module =
+module MODULE_VAR_EXPORT status_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,			/* create per-dir config */
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index cd09038916..afefe2a0e4 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2550,7 +2550,7 @@ static void register_hooks(void)
     ap_hook_access_checker(do_nothing,NULL,NULL,AP_HOOK_REALLY_LAST);
 }
 
-API_EXPORT_VAR module core_module = {
+API_VAR_EXPORT module core_module = {
     STANDARD20_MODULE_STUFF,
     create_core_dir_config,	/* create per-directory config structure */
     merge_core_dir_configs,	/* merge per-directory config structures */
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index f786f60796..795de4dff0 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -126,7 +126,7 @@ static char tspecial[] = {
     '\0'
 };
 
-module MODULE_EXPORT_VAR mime_module;
+module MODULE_VAR_EXPORT mime_module;
 
 static void *create_mime_dir_config(ap_pool_t *p, char *dummy)
 {
@@ -741,7 +741,7 @@ static void register_hooks(void)
     ap_hook_post_config(mime_post_config,NULL,NULL,AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR mime_module = {
+module MODULE_VAR_EXPORT mime_module = {
     STANDARD20_MODULE_STUFF,
     create_mime_dir_config,	/* create per-directory config structure */
     merge_mime_dir_configs,	/* merge per-directory config structures */
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index a2dee51aa9..0727189941 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_EXPORT_VAR config_log_module;
+module MODULE_VAR_EXPORT 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_EXPORT_VAR config_log_module =
+module MODULE_VAR_EXPORT config_log_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* create per-dir config */
diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 96e99ef826..ce2f2a338c 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -86,7 +86,7 @@ typedef struct {
     ap_array_header_t *redirects;
 } alias_dir_conf;
 
-module MODULE_EXPORT_VAR alias_module;
+module MODULE_VAR_EXPORT alias_module;
 
 static void *create_alias_config(ap_pool_t *p, server_rec *s)
 {
@@ -405,7 +405,7 @@ static void register_hooks(void)
     ap_hook_fixups(fixup_redir,NULL,NULL,AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR alias_module =
+module MODULE_VAR_EXPORT alias_module =
 {
     STANDARD20_MODULE_STUFF,
     create_alias_dir_config,	/* dir config creater */
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 0ec1921042..0b00fc3910 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -70,7 +70,7 @@
 #include "http_main.h"
 #include "util_script.h"
 
-module MODULE_EXPORT_VAR dir_module;
+module MODULE_VAR_EXPORT dir_module;
 
 typedef struct dir_config_struct {
     ap_array_header_t *index_names;
@@ -224,7 +224,7 @@ static const handler_rec dir_handlers[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR dir_module = {
+module MODULE_VAR_EXPORT dir_module = {
     STANDARD20_MODULE_STUFF,
     create_dir_config,		/* create per-directory config structure */
     merge_dir_configs,		/* merge per-directory config structures */
diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c
index c7bf5bf918..673e495a88 100644
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imap.c
@@ -118,7 +118,7 @@
 double strtod();                /* SunOS needed this */
 #endif
 
-module MODULE_EXPORT_VAR imap_module;
+module MODULE_VAR_EXPORT imap_module;
 
 typedef struct {
     char *imap_menu;
@@ -900,7 +900,7 @@ static const handler_rec imap_handlers[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR imap_module =
+module MODULE_VAR_EXPORT imap_module =
 {
     STANDARD20_MODULE_STUFF,
     create_imap_dir_config,     /* dir config creater */
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index dd236cf900..e3aa38277b 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -86,7 +86,7 @@ typedef struct {
     ap_array_header_t *language_priority;
 } neg_dir_config;
 
-module MODULE_EXPORT_VAR negotiation_module;
+module MODULE_VAR_EXPORT negotiation_module;
 
 static void *create_neg_dir_config(ap_pool_t *p, char *dummy)
 {
@@ -2743,7 +2743,7 @@ static void register_hooks(void)
     ap_hook_type_checker(handle_multi,NULL,NULL,AP_HOOK_FIRST);
 }
 
-module MODULE_EXPORT_VAR negotiation_module =
+module MODULE_VAR_EXPORT negotiation_module =
 {
     STANDARD20_MODULE_STUFF,
     create_neg_dir_config,      /* dir config creator */
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 5fb4396f53..697d3f5b26 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -211,7 +211,7 @@ static void register_hooks(void)
 }
 
     /* the main config structure */
-module MODULE_EXPORT_VAR rewrite_module = {
+module MODULE_VAR_EXPORT rewrite_module = {
    STANDARD20_MODULE_STUFF,
    config_perdir_create,        /* create per-dir    config structures */
    config_perdir_merge,         /* merge  per-dir    config structures */
diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index 6264c41861..c1389b540f 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -134,7 +134,7 @@
 #include "ap_config.h"
 #include "apr_dso.h"
 
-module MODULE_EXPORT_VAR so_module;
+module MODULE_VAR_EXPORT so_module;
 
 
 /*
@@ -370,7 +370,7 @@ static const command_rec so_cmds[] = {
     { NULL }
 };
 
-module MODULE_EXPORT_VAR so_module = {
+module MODULE_VAR_EXPORT so_module = {
    STANDARD20_MODULE_STUFF,
    NULL,			    /* create per-dir config */
    NULL,			    /* merge per-dir config */
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index c71b7aeb44..29faa63529 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -87,7 +87,7 @@
  * Activate it with "CheckSpelling On"
  */
 
-MODULE_EXPORT_VAR module speling_module;
+MODULE_VAR_EXPORT module speling_module;
 
 typedef struct {
     int enabled;
@@ -554,7 +554,7 @@ static void register_hooks(void)
     ap_hook_fixups(check_speling,NULL,NULL,AP_HOOK_LAST);
 }
 
-module MODULE_EXPORT_VAR speling_module =
+module MODULE_VAR_EXPORT speling_module =
 {
     STANDARD20_MODULE_STUFF,
     create_mconfig_for_directory,  /* create per-dir config */
diff --git a/modules/mappers/mod_vhost_alias.c b/modules/mappers/mod_vhost_alias.c
index 11205e88cc..c5d3783214 100644
--- a/modules/mappers/mod_vhost_alias.c
+++ b/modules/mappers/mod_vhost_alias.c
@@ -80,7 +80,7 @@
 #include "http_core.h"
 
 
-module MODULE_EXPORT_VAR vhost_alias_module;
+module MODULE_VAR_EXPORT vhost_alias_module;
 
 
 /*
@@ -463,7 +463,7 @@ static void register_hooks(void)
     ap_hook_translate_name(mva_translate, NULL, NULL, AP_HOOK_MIDDLE);
 };
 
-module MODULE_EXPORT_VAR vhost_alias_module =
+module MODULE_VAR_EXPORT vhost_alias_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,			/* dir config creater */
diff --git a/modules/metadata/mod_cern_meta.c b/modules/metadata/mod_cern_meta.c
index 4abd05508f..cface066a0 100644
--- a/modules/metadata/mod_cern_meta.c
+++ b/modules/metadata/mod_cern_meta.c
@@ -168,7 +168,7 @@
 #define DEFAULT_METASUFFIX	".meta"
 #define DEFAULT_METAFILES	0
 
-module MODULE_EXPORT_VAR cern_meta_module;
+module MODULE_VAR_EXPORT cern_meta_module;
 
 typedef struct {
     char *metadir;
@@ -381,7 +381,7 @@ static void register_hooks(void)
 {
     ap_hook_fixups(add_cern_meta_data,NULL,NULL,AP_HOOK_MIDDLE);
 }
-module MODULE_EXPORT_VAR cern_meta_module =
+module MODULE_VAR_EXPORT cern_meta_module =
 {
     STANDARD20_MODULE_STUFF,
     create_cern_meta_dir_config,/* dir config creater */
diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index 6ed23cb743..da52b08635 100644
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -113,7 +113,7 @@ typedef struct {
     int vars_present;
 } env_dir_config_rec;
 
-module MODULE_EXPORT_VAR env_module;
+module MODULE_VAR_EXPORT env_module;
 
 static void *create_env_dir_config(ap_pool_t *p, char *dummy)
 {
@@ -258,7 +258,7 @@ static void register_hooks(void)
 }
 
 
-module MODULE_EXPORT_VAR env_module =
+module MODULE_VAR_EXPORT env_module =
 {
     STANDARD20_MODULE_STUFF,
     create_env_dir_config,      /* dir config creater */
diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index c705a7a3a1..1a87060148 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -216,7 +216,7 @@ typedef struct {
 #define ACTIVE_OFF      0
 #define ACTIVE_DONTCARE 2
 
-module MODULE_EXPORT_VAR expires_module;
+module MODULE_VAR_EXPORT expires_module;
 
 static void *create_dir_expires_config(ap_pool_t *p, char *dummy)
 {
@@ -497,7 +497,7 @@ static void register_hooks(void)
     ap_hook_fixups(add_expires,NULL,NULL,AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR expires_module =
+module MODULE_VAR_EXPORT expires_module =
 {
     STANDARD20_MODULE_STUFF,
     create_dir_expires_config,  /* dir config creater */
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index c426606f02..a311345ba6 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -127,7 +127,7 @@ typedef struct {
     ap_array_header_t *headers;
 } headers_conf;
 
-module MODULE_EXPORT_VAR headers_module;
+module MODULE_VAR_EXPORT headers_module;
 
 static void *create_headers_config(ap_pool_t *p, server_rec *s)
 {
@@ -246,7 +246,7 @@ static void register_hooks(void)
 {
     ap_hook_fixups(fixup_headers,NULL,NULL,AP_HOOK_MIDDLE);
 } 
-module MODULE_EXPORT_VAR headers_module =
+module MODULE_VAR_EXPORT headers_module =
 {
     STANDARD20_MODULE_STUFF,
     create_headers_dir_config,  /* dir config creater */
diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index b939fad52b..13a63170cf 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -146,7 +146,7 @@ typedef struct {
     ap_array_header_t *conditionals;
 } sei_cfg_rec;
 
-module MODULE_EXPORT_VAR setenvif_module;
+module MODULE_VAR_EXPORT setenvif_module;
 
 static void *create_setenvif_config(ap_pool_t *p, server_rec *dummy)
 {
@@ -407,7 +407,7 @@ static void register_hooks(void)
     ap_hook_post_read_request(match_headers,NULL,NULL,AP_HOOK_MIDDLE);
 }
 
-module MODULE_EXPORT_VAR setenvif_module =
+module MODULE_VAR_EXPORT setenvif_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 6e53f40f49..677e3b2bf1 100644
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -400,7 +400,7 @@ static void register_hooks(void)
     ap_hook_post_read_request(gen_unique_id, NULL, NULL, AP_HOOK_MIDDLE); 
 }
 
-module MODULE_EXPORT_VAR unique_id_module = {
+module MODULE_VAR_EXPORT unique_id_module = {
     STANDARD20_MODULE_STUFF,
     NULL,                       /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index aa849c2853..7698f24c86 100644
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -105,7 +105,7 @@
 #include "http_core.h"
 #include "http_request.h"
 
-module MODULE_EXPORT_VAR usertrack_module;
+module MODULE_VAR_EXPORT usertrack_module;
 
 typedef struct {
     int always;
@@ -307,7 +307,7 @@ static void register_hooks(void)
 {
     ap_hook_fixups(spot_cookie,NULL,NULL,AP_HOOK_MIDDLE);
 }
-module MODULE_EXPORT_VAR usertrack_module = {
+module MODULE_VAR_EXPORT usertrack_module = {
     STANDARD20_MODULE_STUFF,
     make_cookie_dir,            /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 8cfae556a0..1d086f3000 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -880,7 +880,7 @@ static const command_rec proxy_cmds[] =
     {NULL}
 };
 
-module MODULE_EXPORT_VAR proxy_module =
+module MODULE_VAR_EXPORT proxy_module =
 {
     STANDARD_MODULE_STUFF,
     proxy_init,			/* initializer */
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 2aa35c4b1f..7d0a5753ea 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -112,7 +112,7 @@
 
 #include "explain.h"
 
-extern module MODULE_EXPORT_VAR proxy_module;
+extern module MODULE_VAR_EXPORT proxy_module;
 
 
 /* for proxy_canonenc() */
diff --git a/server/config.c b/server/config.c
index ae7184c54d..4c496fbcc1 100644
--- a/server/config.c
+++ b/server/config.c
@@ -85,13 +85,13 @@
 #include "http_vhost.h"
 #include "util_cfgtree.h"
 
-API_EXPORT_VAR const char *ap_server_argv0;
+API_VAR_EXPORT const char *ap_server_argv0;
 
-API_EXPORT_VAR const char *ap_server_root;
+API_VAR_EXPORT const char *ap_server_root;
 
-API_EXPORT_VAR ap_array_header_t *ap_server_pre_read_config;
-API_EXPORT_VAR ap_array_header_t *ap_server_post_read_config;
-API_EXPORT_VAR ap_array_header_t *ap_server_config_defines;
+API_VAR_EXPORT ap_array_header_t *ap_server_pre_read_config;
+API_VAR_EXPORT ap_array_header_t *ap_server_post_read_config;
+API_VAR_EXPORT ap_array_header_t *ap_server_config_defines;
 
 AP_HOOK_STRUCT(
 	    AP_HOOK_LINK(header_parser)
@@ -126,8 +126,8 @@ static int total_modules = 0;
  * than DYNAMIC_MODULE_LIMIT.
  */
 static int dynamic_modules = 0;
-API_EXPORT_VAR module *top_module = NULL;
-API_EXPORT_VAR module **ap_loaded_modules=NULL;
+API_VAR_EXPORT module *top_module = NULL;
+API_VAR_EXPORT module **ap_loaded_modules=NULL;
 
 typedef int (*handler_func) (request_rec *);
 typedef void *(*dir_maker_func) (ap_pool_t *, char *);
diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 6b6a73cc19..32c1db515d 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1456,7 +1456,7 @@ LISTEN_COMMANDS
 { NULL }
 };
 
-module MODULE_EXPORT_VAR mpm_dexter_module = {
+module MODULE_VAR_EXPORT mpm_dexter_module = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     dexter_pre_config,          /* run hook before the configuration is read */ 
diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index 260b05958a..5e27dd6fd4 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -90,7 +90,7 @@ static int min_spare_threads=0;
 static int max_spare_threads=0;
 static int ap_daemons_limit=0;
 static time_t ap_restart_time=0;
-API_EXPORT_VAR int ap_extended_status = 0;
+API_VAR_EXPORT int ap_extended_status = 0;
 static int workers_may_exit = 0;
 static int requests_this_child;
 static int num_listenfds = 0;
@@ -1259,7 +1259,7 @@ LISTEN_COMMANDS
 { NULL }
 };
 
-module MODULE_EXPORT_VAR mpm_mpmt_beos_module = {
+module MODULE_VAR_EXPORT mpm_mpmt_beos_module = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     mpmt_beos_pre_config,       /* hook run before the configuration is read */
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 7b9d557de4..fdf140c2d6 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -88,13 +88,13 @@
 int ap_threads_per_child=0;         /* Worker threads per child */
 int ap_max_requests_per_child=0;
 static char *ap_pid_fname=NULL;
-API_EXPORT_VAR char *ap_scoreboard_fname=NULL;
+API_VAR_EXPORT char *ap_scoreboard_fname=NULL;
 static int ap_daemons_to_start=0;
 static int min_spare_threads=0;
 static int max_spare_threads=0;
 static int ap_daemons_limit=0;
 static time_t ap_restart_time=0;
-API_EXPORT_VAR int ap_extended_status = 0;
+API_VAR_EXPORT int ap_extended_status = 0;
 static int workers_may_exit = 0;
 static int requests_this_child;
 static int num_listensocks = 0;
@@ -1475,7 +1475,7 @@ LISTEN_COMMANDS
 { NULL }
 };
 
-module MODULE_EXPORT_VAR mpm_mpmt_pthread_module = {
+module MODULE_VAR_EXPORT mpm_mpmt_pthread_module = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     mpmt_pthread_pre_config,    /* run hook before the configuration is read */
diff --git a/server/mpm/mpmt_pthread/scoreboard.c b/server/mpm/mpmt_pthread/scoreboard.c
index 74d57502b2..ffda41a9c7 100644
--- a/server/mpm/mpmt_pthread/scoreboard.c
+++ b/server/mpm/mpmt_pthread/scoreboard.c
@@ -73,7 +73,7 @@
 scoreboard *ap_scoreboard_image = NULL;
 new_scoreboard *ap_new_scoreboard_image = NULL;
 static int maintain_connection_status = 1;
-API_EXPORT_VAR char *ap_scoreboard_fname;
+API_VAR_EXPORT char *ap_scoreboard_fname;
 /*****************************************************************
  *
  * Dealing with the scoreboard... a lot of these variables are global
diff --git a/server/mpm/mpmt_pthread/scoreboard.h b/server/mpm/mpmt_pthread/scoreboard.h
index 43ec6c7c21..9d64c9a191 100644
--- a/server/mpm/mpmt_pthread/scoreboard.h
+++ b/server/mpm/mpmt_pthread/scoreboard.h
@@ -240,9 +240,9 @@ void ap_time_process_request(int child_num, int thread_num, int status);
 
 
 
-API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
+API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
 
-API_EXPORT_VAR extern ap_generation_t volatile ap_my_generation;
+API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
 
 /* for time_process_request() in http_main.c */
 #define START_PREQUEST 1
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index e2e3033c82..9b61016bda 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_EXPORT_VAR scoreboard *ap_scoreboard_image = NULL;
+API_VAR_EXPORT scoreboard *ap_scoreboard_image = NULL;
 static new_scoreboard *ap_new_scoreboard_image = NULL;
 
 #ifdef GPROF
@@ -2434,7 +2434,7 @@ LISTEN_COMMANDS
 { NULL }
 };
 
-module MODULE_EXPORT_VAR mpm_prefork_module = {
+module MODULE_VAR_EXPORT mpm_prefork_module = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     prefork_pre_config,         /* run hook before the configuration is read */
diff --git a/server/mpm/prefork/scoreboard.h b/server/mpm/prefork/scoreboard.h
index c370f01823..fe4c2589f1 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_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
+API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
 
-API_EXPORT_VAR extern ap_generation_t volatile ap_my_generation;
+API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
 
 /* for time_process_request() in http_main.c */
 #define START_PREQUEST 1
diff --git a/server/mpm/spmt_os2/scoreboard.h b/server/mpm/spmt_os2/scoreboard.h
index 3d7335fb47..27baf2bc39 100644
--- a/server/mpm/spmt_os2/scoreboard.h
+++ b/server/mpm/spmt_os2/scoreboard.h
@@ -195,7 +195,7 @@ typedef struct {
 
 API_EXPORT(int) ap_exists_scoreboard_image(void);
 
-API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
+API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
 
 
 /* for time_process_request() in http_main.c */
diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index f35616d5f0..44c133127b 100644
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -1669,7 +1669,7 @@ LISTEN_COMMANDS
 { NULL }
 };
 
-module MODULE_EXPORT_VAR mpm_spmt_os2_module = {
+module MODULE_VAR_EXPORT mpm_spmt_os2_module = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook to run before apache parses args */
     spmt_os2_pre_config,        /* hook run before the configuration is read */
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 99c1202747..9a110cf27a 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -106,7 +106,7 @@ HANDLE maintenance_event;
 ap_lock_t *start_mutex;
 DWORD my_pid;
 DWORD parent_pid;
-API_EXPORT_VAR ap_completion_t ap_mpm_init_complete = NULL;
+API_VAR_EXPORT ap_completion_t ap_mpm_init_complete = NULL;
 
 static ap_status_t socket_cleanup(void *sock)
 {
@@ -1967,7 +1967,7 @@ LISTEN_COMMANDS
 { NULL }
 };
 
-module MODULE_EXPORT_VAR mpm_winnt_module = {
+module MODULE_VAR_EXPORT mpm_winnt_module = {
     MPM20_MODULE_STUFF,
     NULL,                       /* hook run before arguments are parsed */
     winnt_pre_config,           /* hook run before configuration is read */
diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index d53686039d..e0f7b50620 100644
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -67,7 +67,7 @@ extern int ap_extended_status;
 extern void clean_child_exit(int);
 
 typedef void (CALLBACK *ap_completion_t)();
-API_EXPORT_VAR ap_completion_t ap_mpm_init_complete;
+API_VAR_EXPORT ap_completion_t ap_mpm_init_complete;
 
 API_EXPORT(void) ap_start_shutdown(void);
 
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index 9f5c5b1908..8304cc1cf0 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -71,8 +71,8 @@
 #include "..\..\modules\mpm\winnt\winnt.h"
 
 typedef void (CALLBACK *ap_completion_t)();
-API_EXPORT_VAR ap_completion_t ap_mpm_init_complete;
-API_EXPORT_VAR char *ap_server_argv0;
+API_VAR_EXPORT ap_completion_t ap_mpm_init_complete;
+API_VAR_EXPORT char *ap_server_argv0;
 
 static struct
 {