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/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
Date Sat, 27 May 2000 05:28:08 GMT
wrowe       00/05/26 22:28:08

  Modified:    src      ApacheCore.dsp
               src/include ap_config.h ap_mpm.h http_config.h
                        http_connection.h http_core.h http_main.h
                        http_protocol.h http_request.h httpd.h
               src/main http_config.c http_connection.c http_core.c
                        http_protocol.c http_request.c
               src/os/win32 main_win32.c mod_dll.c os.h registry.c
                        service.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
  Log:
  
    This patch corrects the issues from the AP_EXPORT and linkage 
    specification arguments to the ap_hooks.h declarations.  As with
    the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
    and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.
  
    I will be happy to revert the inclusion of ap_config.h from 
    httpd.h if this bothers anyone.  More individual modules need
    to be patched if we do so.
  
    The API_EXPORTs all moved into central storage in the ap_config.h
    header.  Without WIN32 or API_STATIC compile time declarations, 
    these macros remain no-ops.
  
    This patch also moves the following data from http_main to http_config:
  
      const char *ap_server_argv0;
      const char *ap_server_root;
      ap_array_header_t *ap_server_pre_read_config;
      ap_array_header_t *ap_server_post_read_config;
      ap_array_header_t *ap_server_config_defines;
  
    And the following variables had already moved into ap_hooks.c:
  
      ap_pool_t *g_pHookPool;  (initialized now in http_config)
      int g_bDebugHooks;                   (out of http_config)
      const char *g_szCurrentHookName;     (out of http_config)
  
    The changes to http_main.c are in preparation for that module to
    move out to a seperate .exe for win32.  Other platforms will be
    unaffected, outside of these changes.
  
  
  Revision  Changes    Path
  1.25      +3 -3      apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ApacheCore.dsp	2000/05/24 23:44:29	1.24
  +++ ApacheCore.dsp	2000/05/27 05:27:31	1.25
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -69,8 +69,8 @@
   # PROP Intermediate_Dir ".\CoreD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  
  
  
  1.26      +29 -4     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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ap_config.h	2000/05/18 02:17:22	1.25
  +++ ap_config.h	2000/05/27 05:27:32	1.26
  @@ -55,19 +55,44 @@
   #ifndef AP_AC_CONFIG_H
   #define AP_AC_CONFIG_H
   
  +#include "ap_mmn.h"		/* MODULE_MAGIC_NUMBER_ */
  +
  +/* Implemented flags for dynamic library bindings.
  + *
  + *   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
  + */
  +
  +#if !defined(WIN32) || defined(API_STATIC)
  +#define API_EXPORT(type)        type __stdcall
  +#define API_EXPORT_NONSTD(type) type
  +#define API_EXPORT_VAR
  +#define MODULE_EXPORT_VAR
  +#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)
  +#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)
  +#endif
  +
   #ifdef __cplusplus
   extern "C" {
   #endif
   
  -#include "ap_mmn.h"		/* MODULE_MAGIC_NUMBER_ */
  -
   #ifdef WIN32
  -#include "../os/win32/os.h"
  +#include "os.h"
   #else
   #include "ap_config_auto.h"
   #include "ap_config_path.h"
   #include "os.h"
  -#endif /* WIN32 */
  +#endif /* !WIN32 */
   #include "apr.h"
   #ifdef STDC_HEADERS
   #include <stdlib.h>
  
  
  
  1.13      +2 -2      apache-2.0/src/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_mpm.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ap_mpm.h	2000/05/04 04:02:15	1.12
  +++ ap_mpm.h	2000/05/27 05:27:32	1.13
  @@ -122,8 +122,8 @@
    * child to force an exit) and so do an exit anyway.
    */
   
  -void ap_start_shutdown(void);
  -void ap_start_restart(int graceful);
  +API_EXPORT(void) ap_start_shutdown(void);
  +API_EXPORT(void) ap_start_restart(int graceful);
   
   /* 
    * ap_signal_parent() - used to send a signal to the parent process.
  
  
  
  1.22      +6 -6      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_config.h	2000/05/18 00:45:05	1.21
  +++ http_config.h	2000/05/27 05:27:32	1.22
  @@ -364,11 +364,11 @@
   
   #ifdef CORE_PRIVATE
   
  -extern API_VAR_EXPORT module *top_module;
  +extern API_EXPORT_VAR module *top_module;
   
   extern module *ap_prelinked_modules[];
   extern module *ap_preloaded_modules[];
  -extern API_VAR_EXPORT module **ap_loaded_modules;
  +extern API_EXPORT_VAR module **ap_loaded_modules;
   
   /* For mod_so.c... */
   
  @@ -421,12 +421,12 @@
   #endif
   
     /* Hooks */
  -AP_DECLARE_HOOK(int,header_parser,(request_rec *))
  -AP_DECLARE_HOOK(void,post_config,
  +AP_DECLARE_HOOK(API_EXPORT,int,header_parser,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,void,post_config,
   	     (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
  -AP_DECLARE_HOOK(void,open_logs,
  +AP_DECLARE_HOOK(API_EXPORT,void,open_logs,
   	     (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
  -AP_DECLARE_HOOK(void,child_init,(ap_pool_t *pchild, server_rec *s))
  +AP_DECLARE_HOOK(API_EXPORT,void,child_init,(ap_pool_t *pchild, server_rec *s))
   
   #ifdef __cplusplus
   }
  
  
  
  1.17      +2 -2      apache-2.0/src/include/http_connection.h
  
  Index: http_connection.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_connection.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- http_connection.h	2000/05/12 00:40:58	1.16
  +++ http_connection.h	2000/05/27 05:27:33	1.17
  @@ -74,8 +74,8 @@
   #endif
   
     /* Hooks */
  -AP_DECLARE_HOOK(int,pre_connection,(conn_rec *))
  -AP_DECLARE_HOOK(int,process_connection,(conn_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,pre_connection,(conn_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,process_connection,(conn_rec *))
   
   #ifdef __cplusplus
   }
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- http_core.h	2000/04/14 15:58:17	1.9
  +++ http_core.h	2000/05/27 05:27:33	1.10
  @@ -176,7 +176,7 @@
   
   char *ap_response_code_string (request_rec *r, int error_index);
   
  -extern API_VAR_EXPORT module core_module;
  +extern API_EXPORT_VAR module core_module;
   
   /* Per-directory configuration */
   
  
  
  
  1.8       +5 -9      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_main.h	2000/05/19 05:01:52	1.7
  +++ http_main.h	2000/05/27 05:27:33	1.8
  @@ -63,17 +63,13 @@
   extern "C" {
   #endif
   
  -extern MODULE_VAR_EXPORT const char *ap_server_argv0;
  -extern API_VAR_EXPORT const char *ap_server_root;
  +extern API_EXPORT_VAR const char *ap_server_argv0;
  +extern API_EXPORT_VAR const char *ap_server_root;
   
   /* for -C, -c and -D switches */
  -extern ap_array_header_t *ap_server_pre_read_config;
  -extern ap_array_header_t *ap_server_post_read_config;
  -extern ap_array_header_t *ap_server_config_defines;
  -
  -#ifdef WIN32
  -API_EXPORT(int) apache_main(int argc, char *argv[]);
  -#endif
  +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;
   
   #ifdef __cplusplus
   }
  
  
  
  1.14      +4 -4      apache-2.0/src/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- http_protocol.h	2000/04/26 07:14:31	1.13
  +++ http_protocol.h	2000/05/27 05:27:33	1.14
  @@ -227,10 +227,10 @@
      * post_read_request --- run right after read_request or internal_redirect,
      *                  and not run during any subrequests.
      */
  -AP_DECLARE_HOOK(int,post_read_request,(request_rec *))
  -AP_DECLARE_HOOK(int,log_transaction,(request_rec *))
  -AP_DECLARE_HOOK(const char *,http_method,(const request_rec *))
  -AP_DECLARE_HOOK(unsigned short,default_port,(const request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,post_read_request,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,log_transaction,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,const char *,http_method,(const request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,unsigned short,default_port,(const request_rec *))
   
   #ifdef __cplusplus
   }
  
  
  
  1.10      +6 -6      apache-2.0/src/include/http_request.h
  
  Index: http_request.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_request.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- http_request.h	2000/04/26 07:14:31	1.9
  +++ http_request.h	2000/05/27 05:27:34	1.10
  @@ -114,12 +114,12 @@
   #endif
   
     /* Hooks */
  -AP_DECLARE_HOOK(int,translate_name,(request_rec *))
  -AP_DECLARE_HOOK(int,check_user_id,(request_rec *))
  -AP_DECLARE_HOOK(int,fixups,(request_rec *))
  -AP_DECLARE_HOOK(int,type_checker,(request_rec *))
  -AP_DECLARE_HOOK(int,access_checker,(request_rec *))
  -AP_DECLARE_HOOK(int,auth_checker,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,translate_name,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,check_user_id,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,fixups,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,type_checker,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,access_checker,(request_rec *))
  +AP_DECLARE_HOOK(API_EXPORT,int,auth_checker,(request_rec *))
   
   #ifdef __cplusplus
   }
  
  
  
  1.47      +5 -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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- httpd.h	2000/05/17 03:19:36	1.46
  +++ httpd.h	2000/05/27 05:27:34	1.47
  @@ -73,6 +73,7 @@
   
   
   /* Headers in which EVERYONE has an interest... */
  +#include "ap_config.h"
   #include "os.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  @@ -889,11 +890,11 @@
   #define API_EXPORT_NONSTD(type)    type
   #endif
   
  -#ifndef MODULE_VAR_EXPORT
  -#define MODULE_VAR_EXPORT
  +#ifndef MODULE_EXPORT_VAR
  +#define MODULE_EXPORT_VAR
   #endif
  -#ifndef API_VAR_EXPORT
  -#define API_VAR_EXPORT
  +#ifndef API_EXPORT_VAR
  +#define API_EXPORT_VAR
   #endif
   
   /* modules should not used functions marked CORE_EXPORT
  
  
  
  1.50      +31 -13    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.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- http_config.c	2000/05/22 02:57:44	1.49
  +++ http_config.c	2000/05/27 05:27:36	1.50
  @@ -85,6 +85,14 @@
   #include "http_vhost.h"
   #include "util_cfgtree.h"
   
  +API_EXPORT_VAR const char *ap_server_argv0;
  +
  +API_EXPORT_VAR 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;
  +
   AP_HOOK_STRUCT(
   	    AP_HOOK_LINK(header_parser)
   	    AP_HOOK_LINK(post_config)
  @@ -92,14 +100,16 @@
   	    AP_HOOK_LINK(child_init)
   )
   
  -AP_IMPLEMENT_HOOK_RUN_ALL(int,header_parser,(request_rec *r),(r),OK,DECLINED)
  -AP_IMPLEMENT_HOOK_VOID(post_config,
  -		    (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s),
  -		    (pconf,plog,ptemp,s))
  -AP_IMPLEMENT_HOOK_VOID(open_logs,
  -		    (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s),
  -		    (pconf,plog,ptemp,s))
  -AP_IMPLEMENT_HOOK_VOID(child_init,(ap_pool_t *pchild, server_rec *s),(pchild,s))
  +AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,header_parser,
  +                          (request_rec *r),(r),OK,DECLINED)
  +AP_IMPLEMENT_HOOK_VOID(API_EXPORT,post_config,
  +		       (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp,
  +                        server_rec *s),(pconf,plog,ptemp,s))
  +AP_IMPLEMENT_HOOK_VOID(API_EXPORT,open_logs,
  +		       (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, 
  +                        server_rec *s),(pconf,plog,ptemp,s))
  +AP_IMPLEMENT_HOOK_VOID(API_EXPORT,child_init,
  +                       (ap_pool_t *pchild, server_rec *s),(pchild,s))
   
   /****************************************************************
    *
  @@ -116,8 +126,8 @@
    * than DYNAMIC_MODULE_LIMIT.
    */
   static int dynamic_modules = 0;
  -API_VAR_EXPORT module *top_module = NULL;
  -API_VAR_EXPORT module **ap_loaded_modules=NULL;
  +API_EXPORT_VAR module *top_module = NULL;
  +API_EXPORT_VAR module **ap_loaded_modules=NULL;
   
   typedef int (*handler_func) (request_rec *);
   typedef void *(*dir_maker_func) (ap_pool_t *, char *);
  @@ -356,9 +366,6 @@
       return HTTP_INTERNAL_SERVER_ERROR;
   }
   
  -int g_bDebugHooks;
  -const char *g_szCurrentHookName;
  -
   void ap_register_hooks(module *m)
       {
       if(m->register_hooks)
  @@ -532,6 +539,8 @@
       module **m;
       module **m2;
   
  +    g_pHookPool=process->pconf;
  +
       /*
        *  Initialise total_modules variable and module indices
        */
  @@ -1550,6 +1559,15 @@
       if (m->create_dir_config)
           ap_set_module_config(s->lookup_defaults, m,
                                (*m->create_dir_config)(p, NULL));
  +}
  +
  +void ap_run_rewrite_args(process_rec *process)
  +{
  +    module *m;
  +
  +    for (m = top_module; m; m = m->next)
  +        if (m->rewrite_args)
  +            (*m->rewrite_args) (process);
   }
   
   void ap_run_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp)
  
  
  
  1.35      +4 -2      apache-2.0/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- http_connection.c	2000/05/11 21:16:56	1.34
  +++ http_connection.c	2000/05/27 05:27:37	1.35
  @@ -72,8 +72,10 @@
   	    AP_HOOK_LINK(process_connection)
   )
   
  -AP_IMPLEMENT_HOOK_RUN_ALL(int,pre_connection,(conn_rec *c),(c),OK,DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_FIRST(int,process_connection,(conn_rec *c),(c),DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,pre_connection,
  +                          (conn_rec *c),(c),OK,DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,process_connection,
  +                            (conn_rec *c),(c),DECLINED)
   
   /*
    * More machine-dependent networking gooo... on some systems,
  
  
  
  1.61      +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.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- http_core.c	2000/05/25 20:51:23	1.60
  +++ http_core.c	2000/05/27 05:27:37	1.61
  @@ -2550,7 +2550,7 @@
       ap_hook_access_checker(do_nothing,NULL,NULL,AP_HOOK_REALLY_LAST);
   }
   
  -API_VAR_EXPORT module core_module = {
  +API_EXPORT_VAR 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.71      +8 -6      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- http_protocol.c	2000/05/25 20:51:23	1.70
  +++ http_protocol.c	2000/05/27 05:27:37	1.71
  @@ -2898,9 +2898,11 @@
       ap_rflush(r);
   }
   
  -AP_IMPLEMENT_HOOK_RUN_ALL(int,post_read_request,(request_rec *r),(r),OK,DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_ALL(int,log_transaction,(request_rec *r),(r),OK,DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_FIRST(const char *,http_method,(const request_rec *r),(r),
  -			 NULL)
  -AP_IMPLEMENT_HOOK_RUN_FIRST(unsigned short,default_port,(const request_rec *r),
  -			 (r),0)
  +AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,post_read_request,
  +                          (request_rec *r),(r),OK,DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,log_transaction,
  +                          (request_rec *r),(r),OK,DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,const char *,http_method,
  +                            (const request_rec *r),(r),NULL)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,unsigned short,default_port,
  +                            (const request_rec *r),(r),0)
  
  
  
  1.27      +12 -6     apache-2.0/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- http_request.c	2000/05/25 20:51:24	1.26
  +++ http_request.c	2000/05/27 05:27:37	1.27
  @@ -87,12 +87,18 @@
   	    AP_HOOK_LINK(auth_checker)
   )
   
  -AP_IMPLEMENT_HOOK_RUN_FIRST(int,translate_name,(request_rec *r),(r),DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_FIRST(int,check_user_id,(request_rec *r),(r),DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_ALL(int,fixups,(request_rec *r),(r),OK,DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_FIRST(int,type_checker,(request_rec *r),(r),DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_ALL(int,access_checker,(request_rec *r),(r),OK,DECLINED)
  -AP_IMPLEMENT_HOOK_RUN_FIRST(int,auth_checker,(request_rec *r),(r),DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,translate_name,
  +                            (request_rec *r),(r),DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,check_user_id,
  +                            (request_rec *r),(r),DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,fixups,
  +                          (request_rec *r),(r),OK,DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,type_checker,
  +                            (request_rec *r),(r),DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,access_checker,
  +                          (request_rec *r),(r),OK,DECLINED)
  +AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,auth_checker,
  +                            (request_rec *r),(r),DECLINED)
   
   /*****************************************************************
    *
  
  
  
  1.17      +3 -1      apache-2.0/src/os/win32/main_win32.c
  
  Index: main_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- main_win32.c	2000/05/19 05:01:49	1.16
  +++ main_win32.c	2000/05/27 05:27:38	1.17
  @@ -71,6 +71,7 @@
   #define CORE_PRIVATE
   
   #include "main_win32.h"
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_main.h"
   #include "http_config.h"
  @@ -78,12 +79,13 @@
   #include "service.h"
   #include "http_log.h"
   #include "registry.h"
  -#include "ap_config.h"
   #include "..\..\modules\mpm\winnt\winnt.h"
   
   static OSVERSIONINFO osver;
   
   #define DEFAULTSERVICENAME "Apache"
  +
  +API_EXPORT_NONSTD(int) apache_main(int argc, char *argv[]);
   
   static const char* read_config_cmd(char *filename, char *cmd, ap_pool_t *p)
   {
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_dll.c	2000/04/26 07:14:42	1.8
  +++ mod_dll.c	2000/05/27 05:27:38	1.9
  @@ -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_VAR_EXPORT. i.e. if you have
  + *    definition: MODULE_EXPORT_VAR. i.e. if you have
    *    "module foo_module;", replace it with
  - *    "module MODULE_VAR_EXPORT foo_module;". If your module is to be
  + *    "module MODULE_EXPORT_VAR foo_module;". If your module is to be
    *    compiled with both Windows and Unix, you may wish to use an #ifdef
    *    WIN32
    *
  
  
  
  1.30      +0 -22     apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- os.h	2000/05/26 18:58:43	1.29
  +++ os.h	2000/05/27 05:27:38	1.30
  @@ -117,27 +117,6 @@
   typedef int mode_t;
   typedef char * caddr_t;
   
  -/*
  -Define export types. API_EXPORT_NONSTD is a nasty hack to avoid having to declare
  -every configuration function as __stdcall.
  -*/
  -
  -#if defined(API_EXPORT_SYMBOLS)
  -#define API_VAR_EXPORT		__declspec(dllexport)
  -#define API_EXPORT(type)        __declspec(dllexport) type __stdcall
  -#define API_EXPORT_NONSTD(type) __declspec(dllexport) type
  -#elif defined(API_STATIC)
  -#define API_VAR_EXPORT		
  -#define API_EXPORT(type)        type __stdcall
  -#define API_EXPORT_NONSTD(type) type
  -#else
  -#define API_VAR_EXPORT		__declspec(dllimport)
  -#define API_EXPORT(type)        __declspec(dllimport) type __stdcall
  -#define API_EXPORT_NONSTD(type) __declspec(dllimport) type
  -#endif
  -
  -#define MODULE_VAR_EXPORT   __declspec(dllexport)
  -
   #define HAVE_MEMMOVE
   #define HAVE_STRCASECMP
   #define HAVE_STRNCASECMP
  @@ -155,7 +134,6 @@
   #ifndef S_ISDIR
   #define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
   #endif
  -
   
   #define STDIN_FILENO  0
   #define STDOUT_FILENO 1
  
  
  
  1.20      +1 -1      apache-2.0/src/os/win32/registry.c
  
  Index: registry.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/registry.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- registry.c	2000/05/19 05:01:49	1.19
  +++ registry.c	2000/05/27 05:27:38	1.20
  @@ -83,7 +83,7 @@
    * HKLM\Software\[Vendor]\[Software]\[Version]\ServerRoot
    */
   
  -#include "os.h"
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_log.h"
   
  
  
  
  1.12      +3 -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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- service.c	2000/05/19 05:01:49	1.11
  +++ service.c	2000/05/27 05:27:38	1.12
  @@ -61,6 +61,7 @@
   #define  CORE_PRIVATE 
   
   #include "main_win32.h"
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_conf_globals.h"
   #include "http_log.h"
  @@ -70,8 +71,8 @@
   #include "..\..\modules\mpm\winnt\winnt.h"
   
   typedef void (CALLBACK *ap_completion_t)();
  -API_VAR_IMPORT ap_completion_t ap_mpm_init_complete;
  -API_VAR_IMPORT char *ap_server_argv0;
  +API_EXPORT_VAR ap_completion_t ap_mpm_init_complete;
  +API_EXPORT_VAR char *ap_server_argv0;
   
   static struct
   {
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_mmap_static.c	2000/04/26 07:14:36	1.10
  +++ mod_mmap_static.c	2000/05/27 05:27:39	1.11
  @@ -123,7 +123,7 @@
   #include "http_core.h"
   #include "apr_mmap.h"
   
  -module MODULE_VAR_EXPORT mmap_static_module;
  +module MODULE_EXPORT_VAR mmap_static_module;
   
   typedef struct {
       ap_mmap_t *mm;
  @@ -373,7 +373,7 @@
       { NULL }
   };
   
  -module MODULE_VAR_EXPORT mmap_static_module =
  +module MODULE_EXPORT_VAR mmap_static_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                     /* create per-directory config structure */
  
  
  
  1.86      +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.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- dexter.c	2000/05/24 00:42:00	1.85
  +++ dexter.c	2000/05/27 05:27:40	1.86
  @@ -1456,7 +1456,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_dexter_module = {
  +module MODULE_EXPORT_VAR mpm_dexter_module = {
       MPM20_MODULE_STUFF,
       dexter_pre_config,          /* run hook before the configuration is read */ 
       NULL,			/* create per-directory config structure */
  
  
  
  1.25      +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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mpmt_beos.c	2000/05/12 10:35:03	1.24
  +++ mpmt_beos.c	2000/05/27 05:27:40	1.25
  @@ -90,7 +90,7 @@
   static int max_spare_threads=0;
   static int ap_daemons_limit=0;
   static time_t ap_restart_time=0;
  -API_VAR_EXPORT int ap_extended_status = 0;
  +API_EXPORT_VAR 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_VAR_EXPORT mpm_mpmt_beos_module = {
  +module MODULE_EXPORT_VAR mpm_mpmt_beos_module = {
       MPM20_MODULE_STUFF,
       mpmt_beos_pre_config,       /* hook run before the configuration is read */
       NULL,			/* create per-directory config structure */
  
  
  
  1.78      +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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- mpmt_pthread.c	2000/05/24 00:42:01	1.77
  +++ mpmt_pthread.c	2000/05/27 05:27:42	1.78
  @@ -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_VAR_EXPORT char *ap_scoreboard_fname=NULL;
  +API_EXPORT_VAR 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_VAR_EXPORT int ap_extended_status = 0;
  +API_EXPORT_VAR 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_VAR_EXPORT mpm_mpmt_pthread_module = {
  +module MODULE_EXPORT_VAR mpm_mpmt_pthread_module = {
       MPM20_MODULE_STUFF,
       mpmt_pthread_pre_config,    /* run hook before the configuration is read */
       NULL,			/* create per-directory config structure */
  
  
  
  1.29      +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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- scoreboard.c	2000/05/26 18:23:47	1.28
  +++ scoreboard.c	2000/05/27 05:27:42	1.29
  @@ -73,7 +73,7 @@
   scoreboard *ap_scoreboard_image = NULL;
   new_scoreboard *ap_new_scoreboard_image = NULL;
   static int maintain_connection_status = 1;
  -API_VAR_EXPORT char *ap_scoreboard_fname;
  +API_EXPORT_VAR char *ap_scoreboard_fname;
   /*****************************************************************
    *
    * Dealing with the scoreboard... a lot of these variables are global
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- scoreboard.h	2000/05/04 19:42:56	1.14
  +++ scoreboard.h	2000/05/27 05:27:42	1.15
  @@ -240,9 +240,9 @@
   
   
   
  -API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
  +API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
   
  -API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
  +API_EXPORT_VAR extern ap_generation_t volatile ap_my_generation;
   
   /* for time_process_request() in http_main.c */
   #define START_PREQUEST 1
  
  
  
  1.92      +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.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- prefork.c	2000/05/24 20:01:18	1.91
  +++ prefork.c	2000/05/27 05:27:45	1.92
  @@ -172,7 +172,7 @@
   char tpf_server_name[INETD_SERVNAME_LENGTH+1];
   #endif /* TPF */
   
  -API_VAR_EXPORT scoreboard *ap_scoreboard_image = NULL;
  +API_EXPORT_VAR scoreboard *ap_scoreboard_image = NULL;
   static new_scoreboard *ap_new_scoreboard_image = NULL;
   
   #ifdef GPROF
  @@ -2434,7 +2434,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_prefork_module = {
  +module MODULE_EXPORT_VAR mpm_prefork_module = {
       MPM20_MODULE_STUFF,
       prefork_pre_config,         /* run hook before the configuration is read */
       NULL,			/* create per-directory config structure */
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- scoreboard.h	2000/03/31 09:05:10	1.8
  +++ scoreboard.h	2000/05/27 05:27:46	1.9
  @@ -214,9 +214,9 @@
   API_EXPORT(void) ap_sync_scoreboard_image(void);
   API_EXPORT(int) ap_exists_scoreboard_image(void);
   
  -API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
  +API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
   
  -API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
  +API_EXPORT_VAR extern ap_generation_t volatile ap_my_generation;
   
   /* for time_process_request() in http_main.c */
   #define START_PREQUEST 1
  
  
  
  1.8       +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- scoreboard.h	2000/03/31 09:05:11	1.7
  +++ scoreboard.h	2000/05/27 05:27:49	1.8
  @@ -195,7 +195,7 @@
   
   API_EXPORT(int) ap_exists_scoreboard_image(void);
   
  -API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
  +API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
   
   
   /* for time_process_request() in http_main.c */
  
  
  
  1.37      +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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- spmt_os2.c	2000/05/11 21:16:59	1.36
  +++ spmt_os2.c	2000/05/27 05:27:50	1.37
  @@ -1669,7 +1669,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_spmt_os2_module = {
  +module MODULE_EXPORT_VAR mpm_spmt_os2_module = {
       MPM20_MODULE_STUFF,
       spmt_os2_pre_config,        /* hook run before the configuration is read */
       NULL,			/* create per-directory config structure */
  
  
  
  1.69      +4 -3      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.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- winnt.c	2000/05/23 17:28:51	1.68
  +++ winnt.c	2000/05/27 05:27:52	1.69
  @@ -57,8 +57,9 @@
    */
   
   #define CORE_PRIVATE 
  -#include "apr_portable.h"
  +#include "ap_config.h"
   #include "httpd.h" 
  +#include "apr_portable.h"
   #include "http_main.h" 
   #include "http_log.h" 
   #include "http_config.h"	/* for read_config */ 
  @@ -105,7 +106,7 @@
   ap_lock_t *start_mutex;
   DWORD my_pid;
   DWORD parent_pid;
  -API_VAR_EXPORT ap_completion_t ap_mpm_init_complete = NULL;
  +API_EXPORT_VAR ap_completion_t ap_mpm_init_complete = NULL;
   
   static ap_status_t socket_cleanup(void *sock)
   {
  @@ -1966,7 +1967,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_winnt_module = {
  +module MODULE_EXPORT_VAR mpm_winnt_module = {
       MPM20_MODULE_STUFF,
       winnt_pre_config,           /* hook run before configuration is read */
       NULL,			/* create per-directory config structure */
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- winnt.h	2000/05/26 18:23:47	1.12
  +++ winnt.h	2000/05/27 05:27:53	1.13
  @@ -67,7 +67,7 @@
   extern void clean_child_exit(int);
   
   typedef void (CALLBACK *ap_completion_t)();
  -API_VAR_EXPORT ap_completion_t ap_mpm_init_complete;
  +API_EXPORT_VAR ap_completion_t ap_mpm_init_complete;
   
   API_EXPORT(void) ap_start_shutdown(void);
   
  
  
  
  1.7       +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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_proxy.c	2000/04/14 15:59:05	1.6
  +++ mod_proxy.c	2000/05/27 05:27:56	1.7
  @@ -880,7 +880,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT proxy_module =
  +module MODULE_EXPORT_VAR proxy_module =
   {
       STANDARD_MODULE_STUFF,
       proxy_init,			/* initializer */
  
  
  
  1.7       +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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_proxy.h	2000/04/20 14:36:01	1.6
  +++ mod_proxy.h	2000/05/27 05:27:57	1.7
  @@ -112,7 +112,7 @@
   
   #include "explain.h"
   
  -extern module MODULE_VAR_EXPORT proxy_module;
  +extern module MODULE_EXPORT_VAR proxy_module;
   
   
   /* for proxy_canonenc() */
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_access.c	2000/04/26 07:14:36	1.10
  +++ mod_access.c	2000/05/27 05:27:58	1.11
  @@ -105,7 +105,7 @@
       ap_array_header_t *denys;
   } access_dir_conf;
   
  -module MODULE_VAR_EXPORT access_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT access_module =
  +module MODULE_EXPORT_VAR access_module =
   {
       STANDARD20_MODULE_STUFF,
       create_access_dir_config,	/* dir config creater */
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_alias.c	2000/04/26 07:14:36	1.9
  +++ mod_alias.c	2000/05/27 05:27:58	1.10
  @@ -86,7 +86,7 @@
       ap_array_header_t *redirects;
   } alias_dir_conf;
   
  -module MODULE_VAR_EXPORT alias_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT alias_module =
  +module MODULE_EXPORT_VAR alias_module =
   {
       STANDARD20_MODULE_STUFF,
       create_alias_dir_config,	/* dir config creater */
  
  
  
  1.20      +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_asis.c	2000/04/06 23:53:59	1.19
  +++ mod_asis.c	2000/05/27 05:27:58	1.20
  @@ -126,7 +126,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT asis_module =
  +module MODULE_EXPORT_VAR asis_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-directory config structure */
  
  
  
  1.18      +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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_auth.c	2000/04/26 07:14:36	1.17
  +++ mod_auth.c	2000/05/27 05:27:58	1.18
  @@ -118,7 +118,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT auth_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT auth_module =
  +module MODULE_EXPORT_VAR auth_module =
   {
       STANDARD20_MODULE_STUFF,
       create_auth_dir_config,	/* dir config creater */
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_auth_anon.c	2000/04/26 07:14:37	1.12
  +++ mod_auth_anon.c	2000/05/27 05:27:58	1.13
  @@ -210,7 +210,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT auth_anon_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT auth_anon_module =
  +module MODULE_EXPORT_VAR auth_anon_module =
   {
       STANDARD20_MODULE_STUFF,
       create_anon_auth_dir_config,/* dir config creater */
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_auth_digest.c	2000/04/29 16:00:33	1.14
  +++ mod_auth_digest.c	2000/05/27 05:27:58	1.15
  @@ -214,7 +214,7 @@
   static void          *client_mm = NULL;
   #endif	/* HAVE_SHMEM_MM */
   
  -module MODULE_VAR_EXPORT auth_digest_module;
  +module MODULE_EXPORT_VAR auth_digest_module;
   
   /*
    * initialization code
  @@ -1876,7 +1876,7 @@
       ap_hook_fixups(add_auth_info, NULL, NULL, AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT auth_digest_module =
  +module MODULE_EXPORT_VAR auth_digest_module =
   {
       STANDARD20_MODULE_STUFF,
       create_digest_dir_config,	/* dir config creater */
  
  
  
  1.31      +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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- mod_autoindex.c	2000/04/24 14:57:54	1.30
  +++ mod_autoindex.c	2000/05/27 05:27:58	1.31
  @@ -81,7 +81,7 @@
   #include <string.h>
   #endif
   
  -module MODULE_VAR_EXPORT autoindex_module;
  +module MODULE_EXPORT_VAR autoindex_module;
   
   /****************************************************************
    *
  @@ -1680,7 +1680,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT autoindex_module =
  +module MODULE_EXPORT_VAR autoindex_module =
   {
       STANDARD20_MODULE_STUFF,
       create_autoindex_config,	/* dir config creater */
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_cern_meta.c	2000/04/26 07:14:37	1.12
  +++ mod_cern_meta.c	2000/05/27 05:27:58	1.13
  @@ -168,7 +168,7 @@
   #define DEFAULT_METASUFFIX	".meta"
   #define DEFAULT_METAFILES	0
   
  -module MODULE_VAR_EXPORT cern_meta_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT cern_meta_module =
  +module MODULE_EXPORT_VAR cern_meta_module =
   {
       STANDARD20_MODULE_STUFF,
       create_cern_meta_dir_config,/* dir config creater */
  
  
  
  1.41      +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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_cgi.c	2000/05/24 00:15:08	1.40
  +++ mod_cgi.c	2000/05/27 05:27:59	1.41
  @@ -86,7 +86,7 @@
   #include <string.h>
   #endif
   
  -module MODULE_VAR_EXPORT cgi_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT cgi_module =
  +module MODULE_EXPORT_VAR cgi_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* dir config creater */
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_cgid.c	2000/05/27 00:48:49	1.10
  +++ mod_cgid.c	2000/05/27 05:27:59	1.11
  @@ -102,7 +102,7 @@
   #endif
   
   
  -module MODULE_VAR_EXPORT cgid_module; 
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT cgid_module = { 
  +module MODULE_EXPORT_VAR cgid_module = { 
       STANDARD20_MODULE_STUFF, 
       NULL, /* dir config creater */ 
       NULL, /* dir merger --- default is to override */ 
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_dir.c	2000/04/14 15:59:08	1.10
  +++ mod_dir.c	2000/05/27 05:27:59	1.11
  @@ -70,7 +70,7 @@
   #include "http_main.h"
   #include "util_script.h"
   
  -module MODULE_VAR_EXPORT dir_module;
  +module MODULE_EXPORT_VAR dir_module;
   
   typedef struct dir_config_struct {
       ap_array_header_t *index_names;
  @@ -224,7 +224,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT dir_module = {
  +module MODULE_EXPORT_VAR dir_module = {
       STANDARD20_MODULE_STUFF,
       create_dir_config,		/* create per-directory config structure */
       merge_dir_configs,		/* merge per-directory config structures */
  
  
  
  1.21      +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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_echo.c	2000/04/26 07:14:37	1.20
  +++ mod_echo.c	2000/05/27 05:27:59	1.21
  @@ -62,7 +62,7 @@
   #include "http_config.h"
   #include "http_connection.h"
   
  -API_VAR_EXPORT module echo_module;
  +API_EXPORT_VAR module echo_module;
   
   typedef struct
       {
  @@ -121,7 +121,7 @@
       ap_hook_process_connection(process_echo_connection,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -API_VAR_EXPORT module echo_module = {
  +API_EXPORT_VAR module echo_module = {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-directory config structure */
       NULL,			/* merge per-directory config structures */
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_env.c	2000/04/26 07:14:37	1.9
  +++ mod_env.c	2000/05/27 05:27:59	1.10
  @@ -113,7 +113,7 @@
       int vars_present;
   } env_dir_config_rec;
   
  -module MODULE_VAR_EXPORT env_module;
  +module MODULE_EXPORT_VAR env_module;
   
   static void *create_env_dir_config(ap_pool_t *p, char *dummy)
   {
  @@ -258,7 +258,7 @@
   }
   
   
  -module MODULE_VAR_EXPORT env_module =
  +module MODULE_EXPORT_VAR env_module =
   {
       STANDARD20_MODULE_STUFF,
       create_env_dir_config,      /* dir config creater */
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_expires.c	2000/04/26 07:14:37	1.14
  +++ mod_expires.c	2000/05/27 05:27:59	1.15
  @@ -216,7 +216,7 @@
   #define ACTIVE_OFF      0
   #define ACTIVE_DONTCARE 2
   
  -module MODULE_VAR_EXPORT expires_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT expires_module =
  +module MODULE_EXPORT_VAR expires_module =
   {
       STANDARD20_MODULE_STUFF,
       create_dir_expires_config,  /* dir config creater */
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_file_cache.c	2000/05/19 23:24:19	1.4
  +++ mod_file_cache.c	2000/05/27 05:27:59	1.5
  @@ -126,7 +126,7 @@
   #include "http_core.h"
   #include "apr_mmap.h"
   
  -module MODULE_VAR_EXPORT file_cache_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORTS working correctly again    
  + * Will be fixed when we get API_EXPORT_VARS working correctly again    
    */
       return DECLINED;
   #endif
  @@ -523,7 +523,7 @@
       { NULL }
   };
   
  -module MODULE_VAR_EXPORT file_cache_module =
  +module MODULE_EXPORT_VAR file_cache_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                     /* create per-directory config structure */
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_headers.c	2000/04/26 07:14:38	1.8
  +++ mod_headers.c	2000/05/27 05:27:59	1.9
  @@ -127,7 +127,7 @@
       ap_array_header_t *headers;
   } headers_conf;
   
  -module MODULE_VAR_EXPORT headers_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT headers_module =
  +module MODULE_EXPORT_VAR headers_module =
   {
       STANDARD20_MODULE_STUFF,
       create_headers_dir_config,  /* dir config creater */
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_imap.c	2000/04/14 15:59:09	1.12
  +++ mod_imap.c	2000/05/27 05:27:59	1.13
  @@ -118,7 +118,7 @@
   double strtod();                /* SunOS needed this */
   #endif
   
  -module MODULE_VAR_EXPORT imap_module;
  +module MODULE_EXPORT_VAR imap_module;
   
   typedef struct {
       char *imap_menu;
  @@ -900,7 +900,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT imap_module =
  +module MODULE_EXPORT_VAR imap_module =
   {
       STANDARD20_MODULE_STUFF,
       create_imap_dir_config,     /* dir config creater */
  
  
  
  1.33      +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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_include.c	2000/05/24 00:15:09	1.32
  +++ mod_include.c	2000/05/27 05:28:00	1.33
  @@ -113,7 +113,7 @@
   #define RAW_ASCII_CHAR(ch)  (ch)
   #endif /*CHARSET_EBCDIC*/
   
  -module MODULE_VAR_EXPORT includes_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT includes_module =
  +module MODULE_EXPORT_VAR includes_module =
   {
       STANDARD20_MODULE_STUFF,
       create_includes_dir_config, /* dir config creater */
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_info.c	2000/04/14 15:59:09	1.10
  +++ mod_info.c	2000/05/27 05:28:00	1.11
  @@ -103,7 +103,7 @@
       struct info_cfg_lines *next;
   } info_cfg_lines;
   
  -module MODULE_VAR_EXPORT info_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT info_module =
  +module MODULE_EXPORT_VAR info_module =
   {
       STANDARD_MODULE_STUFF,
       NULL,                       /* initializer */
  
  
  
  1.22      +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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_log_config.c	2000/04/26 07:14:38	1.21
  +++ mod_log_config.c	2000/05/27 05:28:00	1.22
  @@ -180,7 +180,7 @@
   #include <limits.h>
   #endif
   
  -module MODULE_VAR_EXPORT config_log_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT config_log_module =
  +module MODULE_EXPORT_VAR config_log_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                       /* create per-dir config */
  
  
  
  1.17      +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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_mime.c	2000/04/26 07:14:38	1.16
  +++ mod_mime.c	2000/05/27 05:28:00	1.17
  @@ -126,7 +126,7 @@
       '\0'
   };
   
  -module MODULE_VAR_EXPORT mime_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT mime_module = {
  +module MODULE_EXPORT_VAR mime_module = {
       STANDARD20_MODULE_STUFF,
       create_mime_dir_config,	/* create per-directory config structure */
       merge_mime_dir_configs,	/* merge per-directory config structures */
  
  
  
  1.28      +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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_negotiation.c	2000/04/26 07:14:38	1.27
  +++ mod_negotiation.c	2000/05/27 05:28:00	1.28
  @@ -86,7 +86,7 @@
       ap_array_header_t *language_priority;
   } neg_dir_config;
   
  -module MODULE_VAR_EXPORT negotiation_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT negotiation_module =
  +module MODULE_EXPORT_VAR negotiation_module =
   {
       STANDARD20_MODULE_STUFF,
       create_neg_dir_config,      /* dir config creator */
  
  
  
  1.27      +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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mod_rewrite.c	2000/05/24 23:45:12	1.26
  +++ mod_rewrite.c	2000/05/27 05:28:00	1.27
  @@ -211,7 +211,7 @@
   }
   
       /* the main config structure */
  -module MODULE_VAR_EXPORT rewrite_module = {
  +module MODULE_EXPORT_VAR rewrite_module = {
      STANDARD20_MODULE_STUFF,
      config_perdir_create,        /* create per-dir    config structures */
      config_perdir_merge,         /* merge  per-dir    config structures */
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_setenvif.c	2000/04/26 07:14:38	1.10
  +++ mod_setenvif.c	2000/05/27 05:28:01	1.11
  @@ -146,7 +146,7 @@
       ap_array_header_t *conditionals;
   } sei_cfg_rec;
   
  -module MODULE_VAR_EXPORT setenvif_module;
  +module MODULE_EXPORT_VAR 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_VAR_EXPORT setenvif_module =
  +module MODULE_EXPORT_VAR setenvif_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                       /* dir config creater */
  
  
  
  1.19      +3 -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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_so.c	2000/05/16 02:57:00	1.18
  +++ mod_so.c	2000/05/27 05:28:01	1.19
  @@ -127,13 +127,14 @@
   
   
   #define CORE_PRIVATE
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_log.h"
   #include "ap_config.h"
   #include "apr_dso.h"
   
  -module MODULE_VAR_EXPORT so_module;
  +module MODULE_EXPORT_VAR so_module;
   
   
   /*
  @@ -369,7 +370,7 @@
       { NULL }
   };
   
  -module MODULE_VAR_EXPORT so_module = {
  +module MODULE_EXPORT_VAR so_module = {
      STANDARD20_MODULE_STUFF,
      NULL,			    /* create per-dir config */
      NULL,			    /* merge per-dir config */
  
  
  
  1.14      +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_speling.c	2000/04/26 07:14:38	1.13
  +++ mod_speling.c	2000/05/27 05:28:01	1.14
  @@ -87,7 +87,7 @@
    * Activate it with "CheckSpelling On"
    */
   
  -MODULE_VAR_EXPORT module speling_module;
  +MODULE_EXPORT_VAR module speling_module;
   
   typedef struct {
       int enabled;
  @@ -554,7 +554,7 @@
       ap_hook_fixups(check_speling,NULL,NULL,AP_HOOK_LAST);
   }
   
  -module MODULE_VAR_EXPORT speling_module =
  +module MODULE_EXPORT_VAR speling_module =
   {
       STANDARD20_MODULE_STUFF,
       create_mconfig_for_directory,  /* create per-dir config */
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_status.c	2000/03/31 09:05:18	1.10
  +++ mod_status.c	2000/05/27 05:28:01	1.11
  @@ -68,7 +68,7 @@
   
   #define STATUS_MAGIC_TYPE "application/x-httpd-status"
   
  -module MODULE_VAR_EXPORT status_module;
  +module MODULE_EXPORT_VAR status_module;
   
   static int print_status_value(void *data, const char *key, const char *val)
   {
  @@ -127,7 +127,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT status_module =
  +module MODULE_EXPORT_VAR status_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-dir config */
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_unique_id.c	2000/04/26 07:14:38	1.9
  +++ mod_unique_id.c	2000/05/27 05:28:01	1.10
  @@ -400,7 +400,7 @@
       ap_hook_post_read_request(gen_unique_id, NULL, NULL, AP_HOOK_MIDDLE); 
   }
   
  -module MODULE_VAR_EXPORT unique_id_module = {
  +module MODULE_EXPORT_VAR unique_id_module = {
       STANDARD20_MODULE_STUFF,
       NULL,                       /* dir config creater */
       NULL,                       /* dir merger --- default is to override */
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_usertrack.c	2000/04/26 07:14:39	1.14
  +++ mod_usertrack.c	2000/05/27 05:28:01	1.15
  @@ -105,7 +105,7 @@
   #include "http_core.h"
   #include "http_request.h"
   
  -module MODULE_VAR_EXPORT usertrack_module;
  +module MODULE_EXPORT_VAR usertrack_module;
   
   typedef struct {
       int always;
  @@ -307,7 +307,7 @@
   {
       ap_hook_fixups(spot_cookie,NULL,NULL,AP_HOOK_MIDDLE);
   }
  -module MODULE_VAR_EXPORT usertrack_module = {
  +module MODULE_EXPORT_VAR usertrack_module = {
       STANDARD20_MODULE_STUFF,
       make_cookie_dir,            /* dir config creater */
       NULL,                       /* dir merger --- default is to override */
  
  
  
  1.8       +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_vhost_alias.c	2000/04/26 07:14:39	1.7
  +++ mod_vhost_alias.c	2000/05/27 05:28:02	1.8
  @@ -80,7 +80,7 @@
   #include "http_core.h"
   
   
  -module MODULE_VAR_EXPORT vhost_alias_module;
  +module MODULE_EXPORT_VAR vhost_alias_module;
   
   
   /*
  @@ -463,7 +463,7 @@
       ap_hook_translate_name(mva_translate, NULL, NULL, AP_HOOK_MIDDLE);
   };
   
  -module MODULE_VAR_EXPORT vhost_alias_module =
  +module MODULE_EXPORT_VAR vhost_alias_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* dir config creater */
  
  
  

Mime
View raw message