httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 mod_dll.c service.c
Date Sat, 27 May 2000 22:40:45 GMT
wrowe       00/05/27 15:40:44

  Modified:    src/ap   ap_hooks.c
               src/include ap.h ap_config.h ap_hooks.h http_config.h
                        http_core.h http_main.h httpd.h
               src/main http_config.c http_core.c
               src/modules/experimental mod_mmap_static.c
               src/modules/mpm/dexter dexter.c
               src/modules/mpm/mpmt_beos mpmt_beos.c
               src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
                        scoreboard.h
               src/modules/mpm/prefork prefork.c scoreboard.h
               src/modules/mpm/spmt_os2 scoreboard.h spmt_os2.c
               src/modules/mpm/winnt winnt.c winnt.h
               src/modules/proxy mod_proxy.c mod_proxy.h
               src/modules/standard mod_access.c mod_alias.c mod_asis.c
                        mod_auth.c mod_auth_anon.c mod_auth_digest.c
                        mod_autoindex.c mod_cern_meta.c mod_cgi.c
                        mod_cgid.c mod_dir.c mod_echo.c mod_env.c
                        mod_expires.c mod_file_cache.c mod_headers.c
                        mod_imap.c mod_include.c mod_info.c
                        mod_log_config.c mod_mime.c mod_negotiation.c
                        mod_rewrite.c mod_setenvif.c mod_so.c mod_speling.c
                        mod_status.c mod_unique_id.c mod_usertrack.c
                        mod_vhost_alias.c
               src/os/win32 mod_dll.c service.c
  Log:
    Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT
    names for linkage (API_, CORE_, and MODULE_).
  
  Revision  Changes    Path
  1.17      +3 -3      apache-2.0/src/ap/ap_hooks.c
  
  Index: ap_hooks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ap_hooks.c	2000/05/27 22:28:00	1.16
  +++ ap_hooks.c	2000/05/27 22:40:19	1.17
  @@ -6,9 +6,9 @@
   #define ap_palloc(pool,size)	malloc(size)
   #endif
   
  -API_EXPORT_VAR ap_pool_t *ap_global_hook_pool = NULL;
  -API_EXPORT_VAR int ap_debug_module_hooks = FALSE;
  -API_EXPORT_VAR const char *ap_debug_module_name = NULL;
  +API_VAR_EXPORT ap_pool_t *ap_global_hook_pool = NULL;
  +API_VAR_EXPORT int ap_debug_module_hooks = FALSE;
  +API_VAR_EXPORT const char *ap_debug_module_name = NULL;
   
   /* NB: This must echo the LINK_##name structure */
   typedef struct
  
  
  
  1.14      +3 -3      apache-2.0/src/include/ap.h
  
  Index: ap.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap.h	2000/05/27 22:28:03	1.13
  +++ ap.h	2000/05/27 22:40:19	1.14
  @@ -63,15 +63,15 @@
   #if !defined(WIN32) || defined(AP_STATIC)
   #define API_EXPORT(type)        type
   #define API_EXPORT_NONSTD(type) type
  -#define API_EXPORT_VAR
  +#define API_VAR_EXPORT
   #elif defined(API_EXPORT_SYMBOLS)
   #define API_EXPORT(type)        __declspec(dllexport) type
   #define API_EXPORT_NONSTD(type) __declspec(dllexport) type
  -#define API_EXPORT_VAR          __declspec(dllexport)
  +#define API_VAR_EXPORT          __declspec(dllexport)
   #else
   #define API_EXPORT(type)        __declspec(dllimport) type
   #define API_EXPORT_NONSTD(type) __declspec(dllimport) type
  -#define API_EXPORT_VAR          __declspec(dllimport)
  +#define API_VAR_EXPORT          __declspec(dllimport)
   #endif
   
   #ifdef __cplusplus
  
  
  
  1.28      +10 -10    apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ap_config.h	2000/05/27 14:22:13	1.27
  +++ ap_config.h	2000/05/27 22:40:19	1.28
  @@ -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
  
  
  
  1.19      +3 -3      apache-2.0/src/include/ap_hooks.h
  
  Index: ap_hooks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_hooks.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ap_hooks.h	2000/05/27 22:28:03	1.18
  +++ ap_hooks.h	2000/05/27 22:40:19	1.19
  @@ -174,9 +174,9 @@
   #define AP_HOOK_LAST		20
   #define AP_HOOK_REALLY_LAST	30
   
  -extern API_EXPORT_VAR ap_pool_t *ap_global_hook_pool;
  -extern API_EXPORT_VAR int ap_debug_module_hooks;
  -extern API_EXPORT_VAR const char *ap_debug_module_name;
  +extern API_VAR_EXPORT ap_pool_t *ap_global_hook_pool;
  +extern API_VAR_EXPORT int ap_debug_module_hooks;
  +extern API_VAR_EXPORT const char *ap_debug_module_name;
   
   API_EXPORT(void) ap_hook_sort_register(const char *szHookName, 
                                         ap_array_header_t **aHooks);
  
  
  
  1.24      +2 -2      apache-2.0/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- http_config.h	2000/05/27 06:22:52	1.23
  +++ http_config.h	2000/05/27 22:40:20	1.24
  @@ -366,11 +366,11 @@
   
   #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... */
   
  
  
  
  1.11      +1 -1      apache-2.0/src/include/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_core.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_core.h	2000/05/27 05:27:33	1.10
  +++ http_core.h	2000/05/27 22:40:20	1.11
  @@ -176,7 +176,7 @@
   
   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 */
   
  
  
  
  1.9       +5 -5      apache-2.0/src/include/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_main.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- http_main.h	2000/05/27 05:27:33	1.8
  +++ http_main.h	2000/05/27 22:40:20	1.9
  @@ -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
   }
  
  
  
  1.48      +4 -4      apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- httpd.h	2000/05/27 05:27:34	1.47
  +++ httpd.h	2000/05/27 22:40:20	1.48
  @@ -890,11 +890,11 @@
   #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
  
  
  
  1.52      +7 -7      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- http_config.c	2000/05/27 05:31:34	1.51
  +++ http_config.c	2000/05/27 22:40:27	1.52
  @@ -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 @@
    * 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 *);
  
  
  
  1.62      +1 -1      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- http_core.c	2000/05/27 05:27:37	1.61
  +++ http_core.c	2000/05/27 22:40:27	1.62
  @@ -2550,7 +2550,7 @@
       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 */
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/experimental/mod_mmap_static.c
  
  Index: mod_mmap_static.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_mmap_static.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_mmap_static.c	2000/05/27 05:27:39	1.11
  +++ mod_mmap_static.c	2000/05/27 22:40:28	1.12
  @@ -123,7 +123,7 @@
   #include "http_core.h"
   #include "apr_mmap.h"
   
  -module MODULE_EXPORT_VAR mmap_static_module;
  +module MODULE_VAR_EXPORT mmap_static_module;
   
   typedef struct {
       ap_mmap_t *mm;
  @@ -373,7 +373,7 @@
       { NULL }
   };
   
  -module MODULE_EXPORT_VAR mmap_static_module =
  +module MODULE_VAR_EXPORT mmap_static_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                     /* create per-directory config structure */
  
  
  
  1.88      +1 -1      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- dexter.c	2000/05/27 06:22:52	1.87
  +++ dexter.c	2000/05/27 22:40:28	1.88
  @@ -1456,7 +1456,7 @@
   { 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 */ 
  
  
  
  1.27      +2 -2      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mpmt_beos.c	2000/05/27 06:22:53	1.26
  +++ mpmt_beos.c	2000/05/27 22:40:28	1.27
  @@ -90,7 +90,7 @@
   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 @@
   { 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 */
  
  
  
  1.80      +3 -3      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- mpmt_pthread.c	2000/05/27 06:22:54	1.79
  +++ mpmt_pthread.c	2000/05/27 22:40:29	1.80
  @@ -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 @@
   { 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 */
  
  
  
  1.30      +1 -1      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- scoreboard.c	2000/05/27 05:27:42	1.29
  +++ scoreboard.c	2000/05/27 22:40:29	1.30
  @@ -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
  
  
  
  1.16      +2 -2      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- scoreboard.h	2000/05/27 05:27:42	1.15
  +++ scoreboard.h	2000/05/27 22:40:29	1.16
  @@ -240,9 +240,9 @@
   
   
   
  -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
  
  
  
  1.94      +2 -2      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- prefork.c	2000/05/27 06:22:54	1.93
  +++ prefork.c	2000/05/27 22:40:30	1.94
  @@ -172,7 +172,7 @@
   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 @@
   { 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 */
  
  
  
  1.10      +2 -2      apache-2.0/src/modules/mpm/prefork/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/scoreboard.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- scoreboard.h	2000/05/27 05:27:46	1.9
  +++ scoreboard.h	2000/05/27 22:40:30	1.10
  @@ -214,9 +214,9 @@
   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
  
  
  
  1.9       +1 -1      apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- scoreboard.h	2000/05/27 05:27:49	1.8
  +++ scoreboard.h	2000/05/27 22:40:30	1.9
  @@ -195,7 +195,7 @@
   
   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 */
  
  
  
  1.39      +1 -1      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- spmt_os2.c	2000/05/27 06:22:55	1.38
  +++ spmt_os2.c	2000/05/27 22:40:30	1.39
  @@ -1669,7 +1669,7 @@
   { 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 */
  
  
  
  1.71      +2 -2      apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- winnt.c	2000/05/27 06:22:55	1.70
  +++ winnt.c	2000/05/27 22:40:31	1.71
  @@ -106,7 +106,7 @@
   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 @@
   { 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 */
  
  
  
  1.14      +1 -1      apache-2.0/src/modules/mpm/winnt/winnt.h
  
  Index: winnt.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- winnt.h	2000/05/27 05:27:53	1.13
  +++ winnt.h	2000/05/27 22:40:31	1.14
  @@ -67,7 +67,7 @@
   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);
   
  
  
  
  1.8       +1 -1      apache-2.0/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_proxy.c	2000/05/27 05:27:56	1.7
  +++ mod_proxy.c	2000/05/27 22:40:33	1.8
  @@ -880,7 +880,7 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR proxy_module =
  +module MODULE_VAR_EXPORT proxy_module =
   {
       STANDARD_MODULE_STUFF,
       proxy_init,			/* initializer */
  
  
  
  1.8       +1 -1      apache-2.0/src/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/mod_proxy.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_proxy.h	2000/05/27 05:27:57	1.7
  +++ mod_proxy.h	2000/05/27 22:40:33	1.8
  @@ -112,7 +112,7 @@
   
   #include "explain.h"
   
  -extern module MODULE_EXPORT_VAR proxy_module;
  +extern module MODULE_VAR_EXPORT proxy_module;
   
   
   /* for proxy_canonenc() */
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_access.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_access.c	2000/05/27 05:27:58	1.11
  +++ mod_access.c	2000/05/27 22:40:34	1.12
  @@ -105,7 +105,7 @@
       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 @@
       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 */
  
  
  
  1.11      +2 -2      apache-2.0/src/modules/standard/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_alias.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_alias.c	2000/05/27 05:27:58	1.10
  +++ mod_alias.c	2000/05/27 22:40:34	1.11
  @@ -86,7 +86,7 @@
       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 @@
       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 */
  
  
  
  1.21      +1 -1      apache-2.0/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_asis.c	2000/05/27 05:27:58	1.20
  +++ mod_asis.c	2000/05/27 22:40:34	1.21
  @@ -126,7 +126,7 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR asis_module =
  +module MODULE_VAR_EXPORT asis_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-directory config structure */
  
  
  
  1.19      +2 -2      apache-2.0/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_auth.c	2000/05/27 05:27:58	1.18
  +++ mod_auth.c	2000/05/27 22:40:34	1.19
  @@ -118,7 +118,7 @@
       {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 @@
       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 */
  
  
  
  1.14      +2 -2      apache-2.0/src/modules/standard/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_anon.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_auth_anon.c	2000/05/27 05:27:58	1.13
  +++ mod_auth_anon.c	2000/05/27 22:40:35	1.14
  @@ -210,7 +210,7 @@
       {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 @@
       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 */
  
  
  
  1.16      +2 -2      apache-2.0/src/modules/standard/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_auth_digest.c	2000/05/27 05:27:58	1.15
  +++ mod_auth_digest.c	2000/05/27 22:40:35	1.16
  @@ -214,7 +214,7 @@
   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 @@
       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 */
  
  
  
  1.32      +2 -2      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_autoindex.c	2000/05/27 05:27:58	1.31
  +++ mod_autoindex.c	2000/05/27 22:40:35	1.32
  @@ -81,7 +81,7 @@
   #include <string.h>
   #endif
   
  -module MODULE_EXPORT_VAR autoindex_module;
  +module MODULE_VAR_EXPORT autoindex_module;
   
   /****************************************************************
    *
  @@ -1680,7 +1680,7 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR autoindex_module =
  +module MODULE_VAR_EXPORT autoindex_module =
   {
       STANDARD20_MODULE_STUFF,
       create_autoindex_config,	/* dir config creater */
  
  
  
  1.14      +2 -2      apache-2.0/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_cern_meta.c	2000/05/27 05:27:58	1.13
  +++ mod_cern_meta.c	2000/05/27 22:40:35	1.14
  @@ -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 @@
   {
       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 */
  
  
  
  1.42      +2 -2      apache-2.0/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- mod_cgi.c	2000/05/27 05:27:59	1.41
  +++ mod_cgi.c	2000/05/27 22:40:35	1.42
  @@ -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 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR cgi_module =
  +module MODULE_VAR_EXPORT cgi_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* dir config creater */
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/standard/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_cgid.c	2000/05/27 05:27:59	1.11
  +++ mod_cgid.c	2000/05/27 22:40:36	1.12
  @@ -102,7 +102,7 @@
   #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 @@
       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 */ 
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/standard/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_dir.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_dir.c	2000/05/27 05:27:59	1.11
  +++ mod_dir.c	2000/05/27 22:40:36	1.12
  @@ -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 @@
       {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 */
  
  
  
  1.22      +2 -2      apache-2.0/src/modules/standard/mod_echo.c
  
  Index: mod_echo.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_echo.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_echo.c	2000/05/27 05:27:59	1.21
  +++ mod_echo.c	2000/05/27 22:40:36	1.22
  @@ -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 @@
       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 */
  
  
  
  1.11      +2 -2      apache-2.0/src/modules/standard/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_env.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_env.c	2000/05/27 05:27:59	1.10
  +++ mod_env.c	2000/05/27 22:40:36	1.11
  @@ -113,7 +113,7 @@
       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 @@
   }
   
   
  -module MODULE_EXPORT_VAR env_module =
  +module MODULE_VAR_EXPORT env_module =
   {
       STANDARD20_MODULE_STUFF,
       create_env_dir_config,      /* dir config creater */
  
  
  
  1.16      +2 -2      apache-2.0/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_expires.c	2000/05/27 05:27:59	1.15
  +++ mod_expires.c	2000/05/27 22:40:36	1.16
  @@ -216,7 +216,7 @@
   #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 @@
       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 */
  
  
  
  1.6       +3 -3      apache-2.0/src/modules/standard/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_file_cache.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_file_cache.c	2000/05/27 05:27:59	1.5
  +++ mod_file_cache.c	2000/05/27 22:40:36	1.6
  @@ -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 @@
    * 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 @@
       { NULL }
   };
   
  -module MODULE_EXPORT_VAR file_cache_module =
  +module MODULE_VAR_EXPORT file_cache_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                     /* create per-directory config structure */
  
  
  
  1.10      +2 -2      apache-2.0/src/modules/standard/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_headers.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_headers.c	2000/05/27 05:27:59	1.9
  +++ mod_headers.c	2000/05/27 22:40:36	1.10
  @@ -127,7 +127,7 @@
       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 @@
   {
       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 */
  
  
  
  1.14      +2 -2      apache-2.0/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_imap.c	2000/05/27 05:27:59	1.13
  +++ mod_imap.c	2000/05/27 22:40:37	1.14
  @@ -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 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR imap_module =
  +module MODULE_VAR_EXPORT imap_module =
   {
       STANDARD20_MODULE_STUFF,
       create_imap_dir_config,     /* dir config creater */
  
  
  
  1.34      +2 -2      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mod_include.c	2000/05/27 05:28:00	1.33
  +++ mod_include.c	2000/05/27 22:40:37	1.34
  @@ -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 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR includes_module =
  +module MODULE_VAR_EXPORT includes_module =
   {
       STANDARD20_MODULE_STUFF,
       create_includes_dir_config, /* dir config creater */
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/standard/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_info.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_info.c	2000/05/27 05:28:00	1.11
  +++ mod_info.c	2000/05/27 22:40:37	1.12
  @@ -103,7 +103,7 @@
       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 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR info_module =
  +module MODULE_VAR_EXPORT info_module =
   {
       STANDARD_MODULE_STUFF,
       NULL,                       /* initializer */
  
  
  
  1.23      +2 -2      apache-2.0/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_log_config.c	2000/05/27 05:28:00	1.22
  +++ mod_log_config.c	2000/05/27 22:40:37	1.23
  @@ -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 @@
       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 */
  
  
  
  1.18      +2 -2      apache-2.0/src/modules/standard/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_mime.c	2000/05/27 05:28:00	1.17
  +++ mod_mime.c	2000/05/27 22:40:37	1.18
  @@ -126,7 +126,7 @@
       '\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 @@
       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 */
  
  
  
  1.29      +2 -2      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_negotiation.c	2000/05/27 05:28:00	1.28
  +++ mod_negotiation.c	2000/05/27 22:40:37	1.29
  @@ -86,7 +86,7 @@
       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 @@
       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 */
  
  
  
  1.28      +1 -1      apache-2.0/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_rewrite.c	2000/05/27 05:28:00	1.27
  +++ mod_rewrite.c	2000/05/27 22:40:37	1.28
  @@ -211,7 +211,7 @@
   }
   
       /* 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 */
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_setenvif.c	2000/05/27 05:28:01	1.11
  +++ mod_setenvif.c	2000/05/27 22:40:37	1.12
  @@ -146,7 +146,7 @@
       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 @@
       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 */
  
  
  
  1.20      +2 -2      apache-2.0/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_so.c	2000/05/27 05:28:01	1.19
  +++ mod_so.c	2000/05/27 22:40:37	1.20
  @@ -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 @@
       { 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 */
  
  
  
  1.15      +2 -2      apache-2.0/src/modules/standard/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_speling.c	2000/05/27 05:28:01	1.14
  +++ mod_speling.c	2000/05/27 22:40:37	1.15
  @@ -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 @@
       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 */
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_status.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_status.c	2000/05/27 05:28:01	1.11
  +++ mod_status.c	2000/05/27 22:40:37	1.12
  @@ -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 @@
       {NULL}
   };
   
  -module MODULE_EXPORT_VAR status_module =
  +module MODULE_VAR_EXPORT status_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-dir config */
  
  
  
  1.11      +1 -1      apache-2.0/src/modules/standard/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_unique_id.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_unique_id.c	2000/05/27 05:28:01	1.10
  +++ mod_unique_id.c	2000/05/27 22:40:37	1.11
  @@ -400,7 +400,7 @@
       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 */
  
  
  
  1.16      +2 -2      apache-2.0/src/modules/standard/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_usertrack.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_usertrack.c	2000/05/27 05:28:01	1.15
  +++ mod_usertrack.c	2000/05/27 22:40:38	1.16
  @@ -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 @@
   {
       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 */
  
  
  
  1.9       +2 -2      apache-2.0/src/modules/standard/mod_vhost_alias.c
  
  Index: mod_vhost_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_vhost_alias.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_vhost_alias.c	2000/05/27 05:28:02	1.8
  +++ mod_vhost_alias.c	2000/05/27 22:40:38	1.9
  @@ -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 @@
       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 */
  
  
  
  1.10      +2 -2      apache-2.0/src/os/win32/mod_dll.c
  
  Index: mod_dll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/mod_dll.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_dll.c	2000/05/27 05:27:38	1.9
  +++ mod_dll.c	2000/05/27 22:40:44	1.10
  @@ -80,9 +80,9 @@
    * Compiling a module as a DLL (using Microsoft Visual C++):
    *
    * 1. Add the following to the module source file's module record
  - *    definition: MODULE_EXPORT_VAR. i.e. if you have
  + *    definition: MODULE_VAR_EXPORT. i.e. if you have
    *    "module foo_module;", replace it with
  - *    "module MODULE_EXPORT_VAR foo_module;". If your module is to be
  + *    "module MODULE_VAR_EXPORT foo_module;". If your module is to be
    *    compiled with both Windows and Unix, you may wish to use an #ifdef
    *    WIN32
    *
  
  
  
  1.13      +2 -2      apache-2.0/src/os/win32/service.c
  
  Index: service.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/service.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- service.c	2000/05/27 05:27:38	1.12
  +++ service.c	2000/05/27 22:40:44	1.13
  @@ -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
   {
  
  
  

Mime
View raw message