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/test test_date.c test_find.c test_parser.c
Date Mon, 16 Oct 2000 06:05:16 GMT
wrowe       00/10/15 23:05:16

  Modified:    src      ApacheCore.dsp ApacheCoreDll.dsp CHANGES
                        buildmark.c
               src/ap   ap_base64.c ap_buckets.c ap_buckets_eos.c
                        ap_buckets_file.c ap_buckets_heap.c
                        ap_buckets_mmap.c ap_buckets_pipe.c
                        ap_buckets_refcount.c ap_buckets_simple.c
                        ap_buckets_socket.c ap_hooks.c ap_sha1.c
               src/helpers MakeEtags
               src/include ap_base64.h ap_buckets.h ap_config.h ap_mmn.h
                        ap_mpm.h ap_sha1.h buff.h http_config.h
                        http_connection.h http_core.h http_log.h
                        http_main.h http_protocol.h http_request.h
                        http_vhost.h httpd.h mpm_status.h util_charset.h
                        util_date.h util_filter.h util_md5.h util_script.h
                        util_uri.h util_xml.h
               src/lib/apr APRDesign
               src/lib/apr/file_io/os2 readwrite.c
               src/lib/apr/file_io/unix readwrite.c
               src/lib/apr/file_io/win32 fileio.h readwrite.c
               src/lib/apr/helpers MakeEtags
               src/lib/apr/include apr.h.in apr.hw apr_file_io.h
                        apr_fnmatch.h apr_getopt.h apr_hash.h apr_lib.h
                        apr_md5.h apr_pools.h apr_strings.h apr_tables.h
               src/lib/apr/lib apr_pools.c
               src/lib/apr/misc/unix getopt.c otherchild.c
               src/lib/apr/misc/win32 names.c
               src/lib/apr/passwd apr_getpass.c apr_md5.c
               src/lib/apr/strings apr_cpystrn.c apr_fnmatch.c
                        apr_snprintf.c apr_strings.c
               src/lib/apr/tables apr_hash.c apr_tables.c
               src/lib/apr/time/unix timestr.c
               src/lib/apr/time/win32 timestr.c
               src/main buff.c http_config.c http_connection.c http_core.c
                        http_log.c http_protocol.c http_request.c
                        http_vhost.c util.c util_charset.c util_date.c
                        util_filter.c util_md5.c util_script.c util_uri.c
                        util_xml.c
               src/modules/experimental mod_mmap_static.c
               src/modules/file_cache mod_cache.c mod_cache.h
               src/modules/mpm/beos beos.c scoreboard.c scoreboard.h
               src/modules/mpm/dexter dexter.c scoreboard.h
               src/modules/mpm/mpmt_beos mpmt_beos.c scoreboard.c
                        scoreboard.h
               src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
                        scoreboard.h
               src/modules/mpm/perchild perchild.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 mpm_winnt.c mpm_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_dbm.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/os2 util_os2.c
               src/os/unix unixd.c unixd.h
               src/os/win32 mod_dll.c os.h util_win32.c
               src/support apxs.in
               src/test test_date.c test_find.c test_parser.c
  Log:
    Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
    for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
    and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
    All _VAR_ flavors changes to _DATA to be absolutely clear.
    Thank you Greg, for the most obvious suggestion.
  
  Revision  Changes    Path
  1.40      +2 -2      apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- ApacheCore.dsp	2000/10/11 17:19:23	1.39
  +++ ApacheCore.dsp	2000/10/16 06:04:27	1.40
  @@ -42,7 +42,7 @@
   RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
  @@ -67,7 +67,7 @@
   RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
  
  
  
  1.3       +2 -2      apache-2.0/src/ApacheCoreDll.dsp
  
  Index: ApacheCoreDll.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCoreDll.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheCoreDll.dsp	2000/10/11 17:19:26	1.2
  +++ ApacheCoreDll.dsp	2000/10/16 06:04:27	1.3
  @@ -42,7 +42,7 @@
   # PROP Intermediate_Dir ".\CoreR"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -68,7 +68,7 @@
   # PROP Intermediate_Dir ".\CoreD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
  
  
  
  1.274     +6 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.273
  retrieving revision 1.274
  diff -u -r1.273 -r1.274
  --- CHANGES	2000/10/13 16:57:11	1.273
  +++ CHANGES	2000/10/16 06:04:27	1.274
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0a8
   
  +  *) Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
  +     for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
  +     and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
  +     All _VAR_ flavors changes to _DATA to be absolutely clear.
  +     [William Rowe]
  +
     *) Add support for /, //, //servername and //server/sharename 
        parsing of <Directory> blocks under Win32 and OS2.
        [Tim Costello, William Rowe, Brian Harvard]
  
  
  
  1.4       +1 -1      apache-2.0/src/buildmark.c
  
  Index: buildmark.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/buildmark.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildmark.c	2000/03/31 07:02:30	1.3
  +++ buildmark.c	2000/10/16 06:04:27	1.4
  @@ -61,7 +61,7 @@
   static const char server_built[] = "unknown";
   #endif
   
  -API_EXPORT(const char *) ap_get_server_built()
  +AP_DECLARE(const char *) ap_get_server_built()
   {
       return server_built;
   }
  
  
  
  1.14      +7 -7      apache-2.0/src/ap/ap_base64.c
  
  Index: ap_base64.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_base64.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap_base64.c	2000/08/07 19:25:59	1.13
  +++ ap_base64.c	2000/10/16 06:04:28	1.14
  @@ -114,7 +114,7 @@
   static apr_xlate_t *xlate_to_ebcdic;
   static unsigned char os_toascii[256];
   
  -API_EXPORT(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii,
  +AP_DECLARE(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii,
                                                apr_xlate_t *to_ebcdic)
   {
       int i;
  @@ -150,7 +150,7 @@
   }
   #endif /*CHARSET_EBCDIC*/
   
  -API_EXPORT(int) ap_base64decode_len(const char *bufcoded)
  +AP_DECLARE(int) ap_base64decode_len(const char *bufcoded)
   {
       int nbytesdecoded;
       register const unsigned char *bufin;
  @@ -165,7 +165,7 @@
       return nbytesdecoded + 1;
   }
   
  -API_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded)
  +AP_DECLARE(int) ap_base64decode(char *bufplain, const char *bufcoded)
   {
   #ifdef CHARSET_EBCDIC
       apr_size_t inbytes_left, outbytes_left;
  @@ -185,7 +185,7 @@
   /* This is the same as ap_base64decode() except on EBCDIC machines, where
    * the conversion of the output to ebcdic is left out.
    */
  -API_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain,
  +AP_DECLARE(int) ap_base64decode_binary(unsigned char *bufplain,
   				   const char *bufcoded)
   {
       int nbytesdecoded;
  @@ -233,12 +233,12 @@
   static const char basis_64[] =
       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   
  -API_EXPORT(int) ap_base64encode_len(int len)
  +AP_DECLARE(int) ap_base64encode_len(int len)
   {
       return ((len + 2) / 3 * 4) + 1;
   }
   
  -API_EXPORT(int) ap_base64encode(char *encoded, const char *string, int len)
  +AP_DECLARE(int) ap_base64encode(char *encoded, const char *string, int len)
   {
   #ifndef CHARSET_EBCDIC
       return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
  @@ -277,7 +277,7 @@
   /* This is the same as ap_base64encode() except on EBCDIC machines, where
    * the conversion of the input to ascii is left out.
    */
  -API_EXPORT(int) ap_base64encode_binary(char *encoded,
  +AP_DECLARE(int) ap_base64encode_binary(char *encoded,
                                         const unsigned char *string, int len)
   {
       int i;
  
  
  
  1.25      +15 -15    apache-2.0/src/ap/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ap_buckets.c	2000/10/16 01:19:17	1.24
  +++ ap_buckets.c	2000/10/16 06:04:28	1.25
  @@ -64,25 +64,25 @@
   
   static apr_array_header_t *bucket_types;
   
  -API_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e)
  +AP_DECLARE(apr_status_t) ap_bucket_destroy(ap_bucket *e)
   {
       e->type->destroy(e->data);
       free(e);
       return APR_SUCCESS;
   }
   
  -API_EXPORT(apr_status_t) ap_bucket_read(ap_bucket *e, const char **str, 
  +AP_DECLARE(apr_status_t) ap_bucket_read(ap_bucket *e, const char **str, 
                                           apr_ssize_t *len, int block)
   {
       return e->type->read(e, str, len, block);
   }
   
  -API_EXPORT(apr_status_t) ap_bucket_setaside(ap_bucket *e)
  +AP_DECLARE(apr_status_t) ap_bucket_setaside(ap_bucket *e)
   {
       return e->type->setaside(e);
   }
   
  -API_EXPORT(apr_status_t) ap_bucket_split(ap_bucket *e, apr_off_t point)
  +AP_DECLARE(apr_status_t) ap_bucket_split(ap_bucket *e, apr_off_t point)
   {
       return e->type->split(e, point);
   }
  @@ -106,13 +106,13 @@
        */
       return APR_SUCCESS;
   }
  -API_EXPORT(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b)
  +AP_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b)
   {
       apr_kill_cleanup(b->p, b, ap_brigade_cleanup);
       return ap_brigade_cleanup(b);
   }
   
  -API_EXPORT(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
  +AP_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
   {
       ap_bucket_brigade *b;
   
  @@ -124,7 +124,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
  +AP_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
   						 ap_bucket *e)
   {
       ap_bucket_brigade *a;
  @@ -142,7 +142,7 @@
       return a;
   }
   
  -API_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +AP_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
   				    struct iovec *vec, int nvec)
   {
       ap_bucket *e;
  @@ -160,7 +160,7 @@
       return vec - orig;
   }
   
  -API_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
  +AP_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
   {
       ap_bucket *r;
       const char *x;
  @@ -187,7 +187,7 @@
       return k;
   }
   
  -API_EXPORT_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...)
  +AP_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...)
   {
       va_list va;
       int written;
  @@ -198,7 +198,7 @@
       return written;
   }
   
  -API_EXPORT_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
  +AP_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
   {
       va_list ap;
       int res;
  @@ -209,7 +209,7 @@
       return res;
   }
   
  -API_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
  +AP_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
   {
       /* XXX:  This needs to be replaced with a function to printf
        * directly into a bucket.  I'm being lazy right now.  RBB
  @@ -250,17 +250,17 @@
       return bucket_types->nelts - 1;
   }
   
  -API_EXPORT(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data)
  +AP_DECLARE(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data)
   {
       return APR_ENOTIMPL;
   }
   
  -API_EXPORT(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, apr_off_t point)
  +AP_DECLARE(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, apr_off_t point)
   {
       return APR_ENOTIMPL;
   }
   
  -API_EXPORT(void) ap_bucket_destroy_notimpl(void *data)
  +AP_DECLARE(void) ap_bucket_destroy_notimpl(void *data)
   {
       return;
   }
  
  
  
  1.10      +2 -2      apache-2.0/src/ap/ap_buckets_eos.c
  
  Index: ap_buckets_eos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_eos.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap_buckets_eos.c	2000/10/15 22:24:12	1.9
  +++ ap_buckets_eos.c	2000/10/16 06:04:28	1.10
  @@ -64,7 +64,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_eos(ap_bucket *b)
  +AP_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b)
   {
       b->length    = AP_END_OF_BRIGADE;
       b->data      = NULL;
  @@ -74,7 +74,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_eos(void)
  +AP_DECLARE(ap_bucket *) ap_bucket_create_eos(void)
   {
       ap_bucket_do_create(ap_bucket_make_eos(b));
   }
  
  
  
  1.6       +2 -2      apache-2.0/src/ap/ap_buckets_file.c
  
  Index: ap_buckets_file.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_file.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap_buckets_file.c	2000/10/15 22:24:13	1.5
  +++ ap_buckets_file.c	2000/10/16 06:04:28	1.6
  @@ -108,7 +108,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd,
                                               apr_off_t offset, apr_size_t len)
   {
       ap_bucket_file *f;
  @@ -128,7 +128,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_file(apr_file_t *fd,
  +AP_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd,
                                                 apr_off_t offset, apr_size_t len)
   {
       ap_bucket_do_create(ap_bucket_make_file(b, fd, offset, len));
  
  
  
  1.14      +2 -2      apache-2.0/src/ap/ap_buckets_heap.c
  
  Index: ap_buckets_heap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_heap.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap_buckets_heap.c	2000/10/15 22:24:13	1.13
  +++ ap_buckets_heap.c	2000/10/16 06:04:28	1.14
  @@ -88,7 +88,7 @@
       free(h);
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
   		const char *buf, apr_size_t length, int copy, apr_ssize_t *w)
   {
       ap_bucket_heap *h;
  @@ -135,7 +135,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_heap(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_heap(
   		const char *buf, apr_size_t length, int copy, apr_ssize_t *w)
   {
       ap_bucket_do_create(ap_bucket_make_heap(b, buf, length, copy, w));
  
  
  
  1.14      +2 -2      apache-2.0/src/ap/ap_buckets_mmap.c
  
  Index: ap_buckets_mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_mmap.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap_buckets_mmap.c	2000/10/15 22:24:13	1.13
  +++ ap_buckets_mmap.c	2000/10/16 06:04:28	1.14
  @@ -87,7 +87,7 @@
   /*
    * XXX: are the start and length arguments useful?
    */
  -API_EXPORT(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length)
   {
       ap_bucket_mmap *m;
  @@ -110,7 +110,7 @@
   }
   
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_mmap(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_mmap(
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length)
   {
       ap_bucket_do_create(ap_bucket_make_mmap(b, mm, start, length));
  
  
  
  1.15      +2 -2      apache-2.0/src/ap/ap_buckets_pipe.c
  
  Index: ap_buckets_pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_pipe.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_buckets_pipe.c	2000/10/15 22:24:13	1.14
  +++ ap_buckets_pipe.c	2000/10/16 06:04:28	1.15
  @@ -97,7 +97,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *p)
  +AP_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *p)
   {
       /*
        * XXX: We rely on a cleanup on some pool or other to actually
  @@ -119,7 +119,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_pipe(apr_file_t *p)
  +AP_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_pipe(b, p));
   }
  
  
  
  1.7       +3 -3      apache-2.0/src/ap/ap_buckets_refcount.c
  
  Index: ap_buckets_refcount.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_refcount.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ap_buckets_refcount.c	2000/09/17 18:52:46	1.6
  +++ ap_buckets_refcount.c	2000/10/16 06:04:29	1.7
  @@ -58,7 +58,7 @@
   
   #include "ap_buckets.h"
   
  -API_EXPORT_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *a, apr_off_t point)
  +AP_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *a, apr_off_t point)
   {
       ap_bucket *b;
       ap_bucket_shared *ad, *bd;
  @@ -95,7 +95,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(void *) ap_bucket_destroy_shared(void *data)
  +AP_DECLARE(void *) ap_bucket_destroy_shared(void *data)
   {
       ap_bucket_shared *s = data;
       ap_bucket_refcount *r = s->data;
  @@ -110,7 +110,7 @@
       }
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
   					      apr_off_t start, apr_off_t end)
   {
       ap_bucket_shared *s;
  
  
  
  1.10      +4 -4      apache-2.0/src/ap/ap_buckets_simple.c
  
  Index: ap_buckets_simple.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_simple.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap_buckets_simple.c	2000/10/15 22:24:13	1.9
  +++ ap_buckets_simple.c	2000/10/16 06:04:29	1.10
  @@ -103,7 +103,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
   		const char *buf, apr_size_t length)
   {
       ap_bucket_simple *bd;
  @@ -123,7 +123,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_immortal(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_immortal(
   		const char *buf, apr_size_t length)
   {
       ap_bucket_do_create(ap_bucket_make_immortal(b, buf, length));
  @@ -156,7 +156,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
   		const char *buf, apr_size_t length)
   {
       b = ap_bucket_make_immortal(b, buf, length);
  @@ -167,7 +167,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_transient(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_transient(
   		const char *buf, apr_size_t length)
   {
       ap_bucket_do_create(ap_bucket_make_transient(b, buf, length));
  
  
  
  1.5       +2 -2      apache-2.0/src/ap/ap_buckets_socket.c
  
  Index: ap_buckets_socket.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_socket.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ap_buckets_socket.c	2000/10/15 22:24:14	1.4
  +++ ap_buckets_socket.c	2000/10/16 06:04:29	1.5
  @@ -97,7 +97,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *p)
  +AP_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *p)
   {
       /*
        * XXX: We rely on a cleanup on some pool or other to actually
  @@ -114,7 +114,7 @@
       return b;
   }
   
  -API_EXPORT(ap_bucket *) ap_bucket_create_socket(apr_socket_t *p)
  +AP_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_socket(b, p));
   }
  
  
  
  1.20      +7 -7      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ap_hooks.c	2000/08/14 00:55:20	1.19
  +++ ap_hooks.c	2000/10/16 06:04:29	1.20
  @@ -60,9 +60,9 @@
   #define apr_palloc(pool,size)	malloc(size)
   #endif
   
  -API_VAR_EXPORT apr_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;
  +AP_DECLARE_DATA apr_pool_t *ap_global_hook_pool = NULL;
  +AP_DECLARE_DATA int ap_debug_module_hooks = FALSE;
  +AP_DECLARE_DATA const char *ap_debug_module_name = NULL;
   
   /* NB: This must echo the LINK_##name structure */
   typedef struct
  @@ -202,7 +202,7 @@
       apr_array_header_t **paHooks;
   } HookSortEntry;
   
  -API_EXPORT(void) ap_hook_sort_register(const char *szHookName,
  +AP_DECLARE(void) ap_hook_sort_register(const char *szHookName,
                                         apr_array_header_t **paHooks)
   {
       HookSortEntry *pEntry;
  @@ -214,7 +214,7 @@
       pEntry->paHooks=paHooks;
   }
   
  -API_EXPORT(void) ap_sort_hooks()
  +AP_DECLARE(void) ap_sort_hooks()
   {
       int n;
   
  @@ -224,7 +224,7 @@
       }
   }
       
  -API_EXPORT(void) ap_hook_deregister_all(void)
  +AP_DECLARE(void) ap_hook_deregister_all(void)
   {
       int n;    
   
  @@ -235,7 +235,7 @@
       s_aHooksToSort=NULL;
   }
   
  -API_EXPORT(void) ap_show_hook(const char *szName,const char * const *aszPre,
  +AP_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
   		             const char * const *aszSucc)
   {
       int nFirst;
  
  
  
  1.15      +6 -6      apache-2.0/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_sha1.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_sha1.c	2000/08/07 19:25:59	1.14
  +++ ap_sha1.c	2000/10/16 06:04:29	1.15
  @@ -122,7 +122,7 @@
   #ifdef CHARSET_EBCDIC
   static apr_xlate_t *ebcdic2ascii_xlate;
   
  -API_EXPORT(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x)
  +AP_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x)
   {
       apr_status_t rv;
       int onoff;
  @@ -243,7 +243,7 @@
   
   /* initialize the SHA digest */
   
  -API_EXPORT(void) ap_SHA1Init(AP_SHA1_CTX *sha_info)
  +AP_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info)
   {
       sha_info->digest[0] = 0x67452301L;
       sha_info->digest[1] = 0xefcdab89L;
  @@ -257,7 +257,7 @@
   
   /* update the SHA digest */
   
  -API_EXPORT(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info,
  +AP_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info,
                                        const unsigned char *buffer,
                                        unsigned int count)
   {
  @@ -296,7 +296,7 @@
       sha_info->local = count;
   }
   
  -API_EXPORT(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf,
  +AP_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf,
                                 unsigned int count)
   {
   #ifdef CHARSET_EBCDIC
  @@ -350,7 +350,7 @@
   
   /* finish computing the SHA digest */
   
  -API_EXPORT(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
  +AP_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
                                AP_SHA1_CTX *sha_info)
   {
       int count, i, j;
  @@ -385,7 +385,7 @@
   }
   
   
  -API_EXPORT(void) ap_sha1_base64(const char *clear, int len, char *out)
  +AP_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out)
   {
       int l;
       AP_SHA1_CTX context;
  
  
  
  1.2       +1 -1      apache-2.0/src/helpers/MakeEtags
  
  Index: MakeEtags
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/helpers/MakeEtags,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MakeEtags	1999/08/24 05:50:35	1.1
  +++ MakeEtags	2000/10/16 06:04:32	1.2
  @@ -27,7 +27,7 @@
   # Exuberant etags is necessary since it can ignore some defined symbols
   # that obscure the function signatures.
   
  -ignore=API_EXPORT,API_EXPORT_NONSTD,__declspec
  +ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec
   
   # Create an etags file at the root of the source
   # tree, then create symbol links to it from each
  
  
  
  1.8       +6 -6      apache-2.0/src/include/ap_base64.h
  
  Index: ap_base64.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_base64.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ap_base64.h	2000/08/02 05:25:26	1.7
  +++ ap_base64.h	2000/10/16 06:04:33	1.8
  @@ -88,7 +88,7 @@
    * @return the length of the string after it is encrypted
    * @deffunc int ap_base64encode_len(int len)
    */ 
  -API_EXPORT(int) ap_base64encode_len(int len);
  +AP_DECLARE(int) ap_base64encode_len(int len);
   
   /**
    * Encode a text string using base64encoding.
  @@ -98,7 +98,7 @@
    * @return the length of the encoded string
    * @deffunc int ap_base64encode(char *coded_dst, const char *plain_src, int len_plain_src)
    */ 
  -API_EXPORT(int) ap_base64encode(char * coded_dst, const char *plain_src,int len_plain_src);
  +AP_DECLARE(int) ap_base64encode(char * coded_dst, const char *plain_src,int len_plain_src);
   
   /**
    * Encode an EBCDIC string using base64encoding.
  @@ -108,7 +108,7 @@
    * @return the length of the encoded string
    * @deffunc int ap_base64encode_binary(char *coded_dst, const char *plain_src, int len_plain_src)
    */ 
  -API_EXPORT(int) ap_base64encode_binary(char * coded_dst, const unsigned char *plain_src,int len_plain_src);
  +AP_DECLARE(int) ap_base64encode_binary(char * coded_dst, const unsigned char *plain_src,int len_plain_src);
   
   /**
    * Determine the length of a plain text string given the encoded version
  @@ -116,7 +116,7 @@
    * @return the length of the plain text string
    * @deffunc int ap_base64decode_len(const char *coded_src)
    */ 
  -API_EXPORT(int) ap_base64decode_len(const char * coded_src);
  +AP_DECLARE(int) ap_base64decode_len(const char * coded_src);
   
   /**
    * Decode a string to plain text
  @@ -125,7 +125,7 @@
    * @return the length of the plain text string
    * @deffunc int ap_base64decode(char *plain_dst, const char *coded_src)
    */ 
  -API_EXPORT(int) ap_base64decode(char * plain_dst, const char *coded_src);
  +AP_DECLARE(int) ap_base64decode(char * plain_dst, const char *coded_src);
   
   /**
    * Decode an EBCDIC string to plain text
  @@ -134,7 +134,7 @@
    * @return the length of the plain text string
    * @deffunc int ap_base64decode_binary(char *plain_dst, const char *coded_src)
    */ 
  -API_EXPORT(int) ap_base64decode_binary(unsigned char * plain_dst, const char *coded_src);
  +AP_DECLARE(int) ap_base64decode_binary(unsigned char * plain_dst, const char *coded_src);
   
   #ifdef __cplusplus
   }
  
  
  
  1.38      +38 -38    apache-2.0/src/include/ap_buckets.h
  
  Index: ap_buckets.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_buckets.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- ap_buckets.h	2000/10/15 22:24:19	1.37
  +++ ap_buckets.h	2000/10/16 06:04:33	1.38
  @@ -369,7 +369,7 @@
    * @return The empty bucket brigade
    * @deffunc ap_bucket_brigade *ap_brigade_create(apr_pool_t *p)
    */
  -API_EXPORT(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
  +AP_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
   
   /**
    * destroy an enitre bucket brigade.  This includes destroying all of the
  @@ -377,7 +377,7 @@
    * @param b The bucket brigade to destroy
    * @deffunc apr_status_t ap_brigade_destroy(ap_bucket_brigade *b)
    */
  -API_EXPORT(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b);
  +AP_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b);
   
   /**
    * Split a bucket brigade into two, such that the given bucket is the
  @@ -389,7 +389,7 @@
    * @return The new brigade
    * @deffunc ap_bucket_brigade *ap_brigade_split(ap_bucket_brigade *b, ap_bucket *e)
    */
  -API_EXPORT(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
  +AP_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
   						 ap_bucket *e);
   
   /**
  @@ -398,7 +398,7 @@
    * @param b The brigade to consume data from
    * @param nbytes The number of bytes to consume
    * @deffunc void ap_brigade_consume(ap_bucket_brigade *b, int nbytes) */
  -API_EXPORT(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
  +AP_DECLARE(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
   
   /**
    * create an iovec of the elements in a bucket_brigade... return number 
  @@ -410,7 +410,7 @@
    * @return The number of iovec elements actually filled out.
    * @deffunc int ap_brigade_to_iovec(ap_bucket_brigade *b, struct iovec *vec, int nvec);
    */
  -API_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +AP_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
   				    struct iovec *vec, int nvec);
   
   /**
  @@ -421,7 +421,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
    */
  -API_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
  +AP_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
   
   /**
    * This function writes an unspecified number of strings into a bucket brigade.
  @@ -431,7 +431,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_putstrs(ap_bucket_brigade *b, ...)
    */
  -API_EXPORT_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...);
  +AP_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...);
   
   /**
    * Evaluate a printf and put the resulting string into a bucket at the end 
  @@ -442,7 +442,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...) 
    */
  -API_EXPORT_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
  +AP_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
   
   /**
    * Evaluate a printf and put the resulting string into a bucket at the end 
  @@ -453,7 +453,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va) 
    */
  -API_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
  +AP_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
   
   
   /*  *****  Bucket Functions  *****  */
  @@ -472,7 +472,7 @@
    * @param e The bucket to destroy
    * @deffunc apr_status_t ap_bucket_destroy(ap_bucket *e)
    */
  -API_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e);
  +AP_DECLARE(apr_status_t) ap_bucket_destroy(ap_bucket *e);
   
   /**
    * read the data from the bucket
  @@ -482,7 +482,7 @@
    * @param block Whether the read function blocks
    * @deffunc apr_status_t ap_bucket_read(ap_bucket *e, const char **str, apr_ssize_t *len, int block)
    */
  -API_EXPORT(apr_status_t) ap_bucket_read(ap_bucket *e, const char **str,
  +AP_DECLARE(apr_status_t) ap_bucket_read(ap_bucket *e, const char **str,
                                           apr_ssize_t *len, int block);
   
   /**
  @@ -491,7 +491,7 @@
    * @param e The bucket to setaside
    * @deffunc apr_status_t ap_bucket_setaside(ap_bucket *e)
    */
  -API_EXPORT(apr_status_t) ap_bucket_setaside(ap_bucket *e);
  +AP_DECLARE(apr_status_t) ap_bucket_setaside(ap_bucket *e);
   
   /**
    * Split one bucket in two.
  @@ -499,15 +499,15 @@
    * @param point The location to split the bucket at
    * @deffunc apr_status_t ap_bucket_split(ap_bucket *e, apr_off_t point)
    */
  -API_EXPORT(apr_status_t) ap_bucket_split(ap_bucket *e, apr_off_t point);
  +AP_DECLARE(apr_status_t) ap_bucket_split(ap_bucket *e, apr_off_t point);
   
   
   /* Bucket type handling */
   
  -API_EXPORT(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data);
  -API_EXPORT(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, 
  +AP_DECLARE(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data);
  +AP_DECLARE(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, 
                                                    apr_off_t point);
  -API_EXPORT(void) ap_bucket_destroy_notimpl(void *data);
  +AP_DECLARE(void) ap_bucket_destroy_notimpl(void *data);
   /* There is no ap_bucket_read_notimpl, because it is a required function
    */
   int ap_insert_bucket_type(const ap_bucket_type *type);
  @@ -540,8 +540,8 @@
    * @param end The end of the data in the bucket
    *            relative to the private base pointer
    * @return The new bucket, or NULL if allocation failed
  - * @deffunc API_EXPORT(ap_bucket *) ap_bucket_shared_create(ap_bucket_refcount *r, apr_off_t start, apr_off_t end) */
  -API_EXPORT(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
  + * @deffunc AP_DECLARE(ap_bucket *) ap_bucket_shared_create(ap_bucket_refcount *r, apr_off_t start, apr_off_t end) */
  +AP_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
   					      apr_off_t start, apr_off_t end);
   
   /**
  @@ -552,8 +552,8 @@
    * @return NULL if nothing needs to be done,
    *         otherwise a pointer to the private data structure which
    *         must be destroyed because its reference count is zero
  - * @deffunc API_EXPORT(void *) ap_bucket_shared_destroy(ap_bucket *b) */
  -API_EXPORT(void *) ap_bucket_destroy_shared(void *data);
  + * @deffunc AP_DECLARE(void *) ap_bucket_shared_destroy(ap_bucket *b) */
  +AP_DECLARE(void *) ap_bucket_destroy_shared(void *data);
   
   /**
    * Split a bucket into two at the given point, and adjust the refcount
  @@ -565,9 +565,9 @@
    * @return APR_EINVAL if the point is not within the bucket;
    *         APR_ENOMEM if allocation failed;
    *         or APR_SUCCESS
  - * @deffunc API_EXPORT(apr_status_t) ap_bucket_shared_split(ap_bucket *b, apr_off_t point)
  + * @deffunc AP_DECLARE(apr_status_t) ap_bucket_shared_split(ap_bucket *b, apr_off_t point)
    */
  -API_EXPORT_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
  +AP_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
   
   
   /*  *****  Functions to Create Buckets of varying type  *****  */
  @@ -609,8 +609,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_eos(void)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_eos(void);
  -API_EXPORT(ap_bucket *) ap_bucket_make_eos(ap_bucket *b);
  +AP_DECLARE(ap_bucket *) ap_bucket_create_eos(void);
  +AP_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b);
   
   
   /**
  @@ -620,9 +620,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_ssize_t *w)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_immortal(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_immortal(
   		const char *buf, apr_size_t nbyte);
  -API_EXPORT(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
   		const char *buf, apr_size_t nbyte);
   
   /**
  @@ -632,9 +632,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_ssize_t *w)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_transient(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_transient(
   		const char *buf, apr_size_t nbyte);
  -API_EXPORT(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
   		const char *buf, apr_size_t nbyte);
   
   /**
  @@ -652,9 +652,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_heap(const char *buf, apr_size_t nbyte, int copy, apr_ssize_t *w)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_heap(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_heap(
   		const char *buf, apr_size_t nbyte, int copy, apr_ssize_t *w);
  -API_EXPORT(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
   		const char *buf, apr_size_t nbyte, int copy, apr_ssize_t *w);
   
   /**
  @@ -666,9 +666,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_mmap(const apr_mmap_t *buf, apr_size_t nbyte, apr_ssize_t *w)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_mmap(
  +AP_DECLARE(ap_bucket *) ap_bucket_create_mmap(
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
  -API_EXPORT(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
  +AP_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
   
   /**
  @@ -677,8 +677,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_socket(apr_socket_t *thissocket)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_socket(apr_socket_t *thissock);
  -API_EXPORT(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
  +AP_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *thissock);
  +AP_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
   
   /**
    * Create a bucket referring to a pipe.
  @@ -686,8 +686,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_pipe(apr_file_t *thispipe)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_pipe(apr_file_t *thispipe);
  -API_EXPORT(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
  +AP_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *thispipe);
  +AP_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
   
   /**
    * Create a bucket referring to a file.
  @@ -697,8 +697,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_file(apr_file_t *thispipe)
    */
  -API_EXPORT(ap_bucket *) ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t len);
  -API_EXPORT(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, 
  +AP_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t len);
  +AP_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, 
                                               apr_off_t offset, apr_size_t len);
   
   #endif /* !AP_BUCKETS_H */
  
  
  
  1.45      +0 -6      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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- ap_config.h	2000/10/12 06:14:30	1.44
  +++ ap_config.h	2000/10/16 06:04:33	1.45
  @@ -108,12 +108,6 @@
   #define AP_DECLARE_DATA             __declspec(dllimport)
   #endif
   
  -/* XXX: move to compatibility aliases once the symbol rename is complete
  - */
  -#define API_EXPORT(t)        AP_DECLARE(t)
  -#define API_EXPORT_NONSTD(t) AP_DECLARE_NONSTD(t)
  -#define API_VAR_EXPORT       AP_DECLARE_DATA
  -
   #if !defined(WIN32) || defined(AP_MODULE_DECLARE_STATIC)
   /**
    * Declare a dso module's exported module structure as AP_MODULE_DECLARE_DATA.
  
  
  
  1.7       +2 -2      apache-2.0/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_mmn.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ap_mmn.h	2000/08/02 05:25:27	1.6
  +++ ap_mmn.h	2000/10/16 06:04:33	1.7
  @@ -123,13 +123,13 @@
    *			  content_languages MUST all be lowercase strings,
    *			  and MAY NOT be modified in place -- modifications
    *			  require pstrdup().
  - * 19980317 (1.3b6-dev)	- CORE_EXPORTs for win32 and <Perl>
  + * 19980317 (1.3b6-dev)	- AP_CORE_DECLAREs for win32 and <Perl>
    *			  API export basic_http_header, send_header_field,
    *			  set_keepalive, srm_command_loop, check_cmd_context,
    *			  tm2sec
    *			  spacetoplus(), plustospace(), client_to_stdout()
    *			  removed
  - * 19980324 (1.3b6-dev)	- API_EXPORT(index_of_response)
  + * 19980324 (1.3b6-dev)	- AP_DECLARE(index_of_response)
    * 19980413 (1.3b6-dev)	- The BIG SYMBOL RENAMING: general ap_ prefix
    *			  (see src/include/compat.h for more details)
    *			  apr_vformatter() API, see src/include/ap.h
  
  
  
  1.17      +3 -3      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ap_mpm.h	2000/08/23 00:01:51	1.16
  +++ ap_mpm.h	2000/10/16 06:04:33	1.17
  @@ -115,7 +115,7 @@
    * @return 1 for shutdown 0 otherwise.
    * @deffunc int ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *server_conf)
    */
  -API_EXPORT(int) ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *server_conf);
  +AP_DECLARE(int) ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *server_conf);
   
   /**
    * predicate indicating if a graceful stop has been requested ...
  @@ -123,7 +123,7 @@
    * @return 1 if a graceful stop has been requested, 0 otherwise
    * @deffunc int ap_graceful_stop_signalled*void)
    */
  -API_EXPORT(int) ap_graceful_stop_signalled(void);
  +AP_DECLARE(int) ap_graceful_stop_signalled(void);
   
   /**
    * ap_start_shutdown() and ap_start_restart() is a function to initiate 
  @@ -139,6 +139,6 @@
    * @deffunc void ap_start_shutdown(void)
    */
   
  -API_EXPORT(void) ap_start_shutdown(void);
  +AP_DECLARE(void) ap_start_shutdown(void);
   
   #endif
  
  
  
  1.11      +5 -5      apache-2.0/src/include/ap_sha1.h
  
  Index: ap_sha1.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_sha1.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap_sha1.h	2000/08/02 05:25:27	1.10
  +++ ap_sha1.h	2000/10/16 06:04:33	1.11
  @@ -115,14 +115,14 @@
    *     to break since the search space is smaller.
    * @deffunc void ap_sha1_base64(const char *clear, int len, char *out)
    */
  -API_EXPORT(void) ap_sha1_base64(const char *clear, int len, char *out);
  +AP_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out);
   
   /**
    * Initialize the SHA digest
    * @param context The SHA context to initialize
    * @deffunc void ap_SHA1Init(AP_SHA1_CTX *context);
    */
  -API_EXPORT(void) ap_SHA1Init(AP_SHA1_CTX *context);
  +AP_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *context);
   
   /**
    * Update the SHA digest
  @@ -131,7 +131,7 @@
    * @param inputLen The length of the input buffer
    * @deffunc void ap_SHA1Update(AP_SHA1_CTX *context, const char *input, unsigned int inputLen)
    */
  -API_EXPORT(void) ap_SHA1Update(AP_SHA1_CTX *context, const char *input,
  +AP_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *context, const char *input,
                                 unsigned int inputLen);
   
   /**
  @@ -141,7 +141,7 @@
    * @param inputLen The length of the input buffer
    * @deffunc void ap_SHA1Update_binary(AP_SHA1_CTX *context, const unsigned char *input, unsigned int inputLen)
    */
  -API_EXPORT(void) ap_SHA1Update_binary(AP_SHA1_CTX *context,
  +AP_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *context,
                                        const unsigned char *input,
                                        unsigned int inputLen);
   
  @@ -151,7 +151,7 @@
    * @param context The context to finalize
    * @deffunc void ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], AP_SHA1_CTX *context)
    */
  -API_EXPORT(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
  +AP_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
                                AP_SHA1_CTX *context);
   
   #ifdef __cplusplus
  
  
  
  1.37      +23 -23    apache-2.0/src/include/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- buff.h	2000/09/10 20:45:16	1.36
  +++ buff.h	2000/10/16 06:04:33	1.37
  @@ -219,38 +219,38 @@
   #endif /*APACHE_XLATE*/
   
   /* Stream creation and modification */
  -API_EXPORT(BUFF *) ap_bcreate(apr_pool_t *p, int flags);
  +AP_DECLARE(BUFF *) ap_bcreate(apr_pool_t *p, int flags);
   
  -API_EXPORT(void) ap_bpush_socket(BUFF *fb, apr_socket_t *sock);
  -API_EXPORT(void) ap_bpop_socket(apr_socket_t **sock, BUFF *fb);
  +AP_DECLARE(void) ap_bpush_socket(BUFF *fb, apr_socket_t *sock);
  +AP_DECLARE(void) ap_bpop_socket(apr_socket_t **sock, BUFF *fb);
   
  -API_EXPORT(apr_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval);
  -API_EXPORT(apr_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval);
  -API_EXPORT(int) ap_bsetflag(BUFF *fb, int flag, int value);
  -API_EXPORT(apr_status_t) ap_bclose(BUFF *fb);
  +AP_DECLARE(apr_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval);
  +AP_DECLARE(apr_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval);
  +AP_DECLARE(int) ap_bsetflag(BUFF *fb, int flag, int value);
  +AP_DECLARE(apr_status_t) ap_bclose(BUFF *fb);
   
   #define ap_bgetflag(fb, flag)	((fb)->flags & (flag))
   
   /* Error handling */
  -API_EXPORT(void) ap_bonerror(BUFF *fb,
  +AP_DECLARE(void) ap_bonerror(BUFF *fb,
                                void (*error) (BUFF *, int, void *, apr_status_t),
                                void *data);
  -API_EXPORT(apr_status_t) ap_berror(BUFF *fb);
  +AP_DECLARE(apr_status_t) ap_berror(BUFF *fb);
   
   /* I/O */
   /* read bytes into the specified buffer.
    * *bytes_read is set to the number of bytes read.  it is possible for
    * bytes to have been read even if an error (or APR_EOF) is returned.
    */
  -API_EXPORT(apr_status_t) ap_bread_core(BUFF *fb, void *buf, apr_size_t nbyte,
  +AP_DECLARE(apr_status_t) ap_bread_core(BUFF *fb, void *buf, apr_size_t nbyte,
                                    apr_ssize_t *bytes_read);
  -API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb);
  -API_EXPORT(int) ap_blookc(BUFF *fb);
  +AP_DECLARE(int) ap_bgets(char *s, int n, BUFF *fb);
  +AP_DECLARE(int) ap_blookc(BUFF *fb);
   /* write bytes from the specified buffer.
    * *bytes_written is set to the number of bytes written.  it is possible
    * for both an error to be returned, and bytes to have been written.
    */
  -API_EXPORT(apr_status_t) ap_bwrite_core(BUFF *fb, const void *buf, apr_size_t nbyte,
  +AP_DECLARE(apr_status_t) ap_bwrite_core(BUFF *fb, const void *buf, apr_size_t nbyte,
                                     apr_ssize_t *bytes_written);
   #ifdef APACHE_XLATE
   #define ap_bwrite(fb,buf,nbyte,bytes_written) \
  @@ -264,23 +264,23 @@
   ap_bread_core(fb,buf,nbyte,bytes_read)
   #endif /*APACHE_XLATE*/
       
  -API_EXPORT(apr_status_t) ap_bflush(BUFF *fb);
  -API_EXPORT(apr_status_t) ap_bshutdown(BUFF *fb, int how);
  -API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
  -API_EXPORT_NONSTD(int) ap_bprintf(BUFF *fb, const char *fmt,...)
  +AP_DECLARE(apr_status_t) ap_bflush(BUFF *fb);
  +AP_DECLARE(apr_status_t) ap_bshutdown(BUFF *fb, int how);
  +AP_DECLARE(int) ap_bputs(const char *x, BUFF *fb);
  +AP_DECLARE_NONSTD(int) ap_bprintf(BUFF *fb, const char *fmt,...)
   				__attribute__((format(printf,2,3)));
  -API_EXPORT(int) ap_vbprintf(BUFF *fb, const char *fmt, va_list vlist);
  +AP_DECLARE(int) ap_vbprintf(BUFF *fb, const char *fmt, va_list vlist);
   
   /* ### ap_bvputs is a misnomer, since it doesn't take a va_list */
   #define ap_bvputs       ap_bputstrs
  -API_EXPORT_NONSTD(int) ap_bputstrs(BUFF *fb, ...);
  -API_EXPORT(int) ap_vbputstrs(BUFF *fb, va_list va);
  +AP_DECLARE_NONSTD(int) ap_bputstrs(BUFF *fb, ...);
  +AP_DECLARE(int) ap_vbputstrs(BUFF *fb, va_list va);
   
   /* Internal routines */
  -API_EXPORT(int) ap_bflsbuf(int c, BUFF *fb);
  -API_EXPORT(int) ap_bfilbuf(BUFF *fb);
  +AP_DECLARE(int) ap_bflsbuf(int c, BUFF *fb);
  +AP_DECLARE(int) ap_bfilbuf(BUFF *fb);
   /* bflush() now if a read would have to block */
  -API_EXPORT(void) ap_bhalfduplex(BUFF *fb);
  +AP_DECLARE(void) ap_bhalfduplex(BUFF *fb);
   
   
   #ifndef APACHE_XLATE
  
  
  
  1.50      +43 -43    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.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- http_config.h	2000/09/13 01:58:13	1.49
  +++ http_config.h	2000/10/16 06:04:33	1.50
  @@ -456,7 +456,7 @@
    * @return The module-specific data
    * @deffunc void *ap_get_module_config(void *conf_vector, module *m)
    */
  -API_EXPORT(void *) ap_get_module_config(void *conf_vector, module *m);
  +AP_DECLARE(void *) ap_get_module_config(void *conf_vector, module *m);
   /**
    * Generic accessors for other modules to set at their own module-specific
    * data
  @@ -466,7 +466,7 @@
    * @param val The module-specific data to set
    * @deffunc void ap_set_module_config(void *conf_vector, module *m, void *val)
    */
  -API_EXPORT(void) ap_set_module_config(void *conf_vector, module *m, void *val);
  +AP_DECLARE(void) ap_set_module_config(void *conf_vector, module *m, void *val);
   
   #define ap_get_module_config(v,m)	\
       (((void **)(v))[(m)->module_index])
  @@ -481,7 +481,7 @@
    * @return An error string or NULL on success
    * @deffunc const char *ap_set_string_slot(cmd_parms *cmd, void *struct_ptr, const char *arg)
    */
  -API_EXPORT_NONSTD(const char *) ap_set_string_slot(cmd_parms *, void *,
  +AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *, void *,
   						   const char *);
   
   /**
  @@ -495,7 +495,7 @@
    * @return  0 if the method is not limited in the current scope
    * @deffunc ap_method_is_limited(cmd_parms *cmd, const char *method)
    */
  -API_EXPORT(int) ap_method_is_limited(cmd_parms *cmd, const char *method);
  +AP_DECLARE(int) ap_method_is_limited(cmd_parms *cmd, const char *method);
   
   /**
    * Generic command handling function for strings, always sets the value
  @@ -506,7 +506,7 @@
    * @return An error string or NULL on success
    * @deffunc const char *ap_set_string_slot_lower(cmd_parms *cmd, void *struct_ptr, const char *arg)
    */
  -API_EXPORT_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *, 
  +AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *, 
   							 void *, const char *);
   /**
    * Generic command handling function for flags
  @@ -516,7 +516,7 @@
    * @return An error string or NULL on success
    * @deffunc const char *ap_set_flag_slot(cmd_parms *cmd, void *struct_ptr, int arg)
    */
  -API_EXPORT_NONSTD(const char *) ap_set_flag_slot(cmd_parms *, void *, int);
  +AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *, void *, int);
   /**
    * Generic command handling function for files
    * @param cmd The command parameters for this directive
  @@ -525,7 +525,7 @@
    * @return An error string or NULL on success
    * @deffunc const char *ap_set_file_slot(cmd_parms *cmd, char *struct_ptr, const char *arg)
    */
  -API_EXPORT_NONSTD(const char *) ap_set_file_slot(cmd_parms *, char *, const char *);
  +AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *, char *, const char *);
   
   /**
    * For modules which need to read config files, open logs, etc. ...
  @@ -535,7 +535,7 @@
    * @param fname The file name
    * @deffunc const char *ap_server_root_relative(apr_pool_t *p, const char *fname)
    */
  -API_EXPORT(const char *) ap_server_root_relative(apr_pool_t *p, const char *fname);
  +AP_DECLARE(const char *) ap_server_root_relative(apr_pool_t *p, const char *fname);
   
   /* Finally, the hook for dynamically loading modules in... */
   
  @@ -544,7 +544,7 @@
    * @param m the module structure of the module to add
    * @deffunc void ap_add_module(module *m)
    */
  -API_EXPORT(void) ap_add_module(module *m);
  +AP_DECLARE(void) ap_add_module(module *m);
   /**
    * Remove a module from the server.  There are some caveats:
    * when the module is removed, its slot is lost so all the current
  @@ -554,19 +554,19 @@
    * @param m the module structure of the module to remove
    * @deffunc void ap_remove_module(module *m)
    */
  -API_EXPORT(void) ap_remove_module(module *m);
  +AP_DECLARE(void) ap_remove_module(module *m);
   /**
    * Add a module to the chained modules list and the list of loaded modules
    * @param m the module structure of the module to add
    * @deffunc void ap_add_loaded_module(module *m)
    */
  -API_EXPORT(void) ap_add_loaded_module(module *mod);
  +AP_DECLARE(void) ap_add_loaded_module(module *mod);
   /**
    * Remove a module fromthe chained modules list and the list of loaded modules
    * @param m the module structure of the module to remove
    * @deffunc void ap_remove_loaded_module(module *m)
    */
  -API_EXPORT(void) ap_remove_loaded_module(module *mod);
  +AP_DECLARE(void) ap_remove_loaded_module(module *mod);
   /**
    * Add a module to the list of loaded module based on the name of the
    * module
  @@ -574,26 +574,26 @@
    * @return 1 on success, 0 on failure
    * @deffunc int ap_add_named_module(const char *name)
    */
  -API_EXPORT(int) ap_add_named_module(const char *name);
  +AP_DECLARE(int) ap_add_named_module(const char *name);
   /**
    * Clear all of the modules from the loaded module list 
    * @deffunc void ap_add_named_module(void)
    */
  -API_EXPORT(void) ap_clear_module_list(void);
  +AP_DECLARE(void) ap_clear_module_list(void);
   /**
    * Find the name of the specified module
    * @param m The module to get the name for
    * @return the name of the module
    * @deffunc const char *ap_find_module_name(module *m)
    */
  -API_EXPORT(const char *) ap_find_module_name(module *m);
  +AP_DECLARE(const char *) ap_find_module_name(module *m);
   /**
    * Find a module based on the name of the module
    * @param name the name of the module
    * @return the module structure if found, NULL otherwise
    * @deffunc module *ap_find_linked_module(const char *name)
    */
  -API_EXPORT(module *) ap_find_linked_module(const char *name);
  +AP_DECLARE(module *) ap_find_linked_module(const char *name);
   
   /**
    * Open a configfile_t as apr_file_t
  @@ -602,7 +602,7 @@
    * @param name the name of the file to open
    * @deffunc apr_status_t ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name)
    */
  -API_EXPORT(apr_status_t) ap_pcfg_openfile(configfile_t **, apr_pool_t *p, const char *name);
  +AP_DECLARE(apr_status_t) ap_pcfg_openfile(configfile_t **, apr_pool_t *p, const char *name);
   
   /**
    * Allocate a configfile_t handle with user defined functions and params 
  @@ -614,7 +614,7 @@
    * @param close_func The close function
    * @deffunc configfile_t *ap_pcfg_open_custom(apr_pool_t *p, const char *descr, void *param, int(*getc_func)(void*), void *(*gets_func) (void *buf, size_t bufsiz, void *param), int(*close_func)(void *param))
    */
  -API_EXPORT(configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *descr,
  +AP_DECLARE(configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *descr,
       void *param,
       int(*getc_func)(void*),
       void *(*gets_func) (void *buf, size_t bufsiz, void *param),
  @@ -628,7 +628,7 @@
    * @return 1 on success, 0 on failure
    * @deffunc int ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp)
    */
  -API_EXPORT(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);
  +AP_DECLARE(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);
   
   /**
    * Read one char from open configfile_t, increase line number upon LF 
  @@ -636,7 +636,7 @@
    * @return the character read
    * @deffunc int ap_cfg_getc(configfile_t *cfp)
    */
  -API_EXPORT(int) ap_cfg_getc(configfile_t *cfp);
  +AP_DECLARE(int) ap_cfg_getc(configfile_t *cfp);
   
   /**
    * Detach from open configfile_t, calling the close handler
  @@ -644,7 +644,7 @@
    * @return 1 on sucess, 0 on failure
    * @deffunc int ap_cfg_closefile(configfile_t *cfp)
    */
  -API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp);
  +AP_DECLARE(int) ap_cfg_closefile(configfile_t *cfp);
   
   /**
    * Read all data between the current <foo> and the matching </foo>.  All
  @@ -654,7 +654,7 @@
    * @retrn Error string on failure, NULL on success
    * @deffunc const char *ap_soak_end_container(cmd_parms *cmd, char *directive)
    */
  -API_EXPORT(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive);
  +AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive);
   
   /**
    * Read all data between the current <foo> and the matching </foo> and build
  @@ -683,7 +683,7 @@
    * @return Error string on erro, NULL otherwise
    * @deffunc const char *ap_build_config(cmd_parms *parms, apr_pool_t *conf_pool, apr_pool_t *temp_pool, ap_directive_t **conftree)
    */
  -API_EXPORT(const char *) ap_build_config(cmd_parms *parms,
  +AP_DECLARE(const char *) ap_build_config(cmd_parms *parms,
   					 apr_pool_t *conf_pool,
   					 apr_pool_t *temp_pool,
   					 ap_directive_t **conftree);
  @@ -696,7 +696,7 @@
    * @return Error string on error, NULL otherwise
    * @deffunc const char *ap_walk_config(ap_directive_t *conftree, cmd_parms *parms, void *config)
    */
  -API_EXPORT(const char *) ap_walk_config(ap_directive_t *conftree,
  +AP_DECLARE(const char *) ap_walk_config(ap_directive_t *conftree,
   					cmd_parms *parms, void *config);
   
   /**
  @@ -715,7 +715,7 @@
    * @return Error string on error, NULL on success
    * @deffunc const char *ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden)
    */
  -API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden);
  +AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden);
   
   /* ap_check_cmd_context():              Forbidden in: */
   #define  NOT_IN_VIRTUALHOST     0x01 /* <Virtualhost> */
  @@ -733,23 +733,23 @@
    * The topmost module in the list
    * @defvar module *top_module
    */
  -extern API_VAR_EXPORT module *top_module;
  +extern AP_DECLARE_DATA module *top_module;
   
   /**
    * Array of all statically linked modules
    * @defvar module *ap_prelinked_modules[]
    */
  -extern API_VAR_EXPORT module *ap_prelinked_modules[];
  +extern AP_DECLARE_DATA module *ap_prelinked_modules[];
   /**
    * Array of all preloaded modules
    * @defvar module *ap_preloaded_modules[]
    */
  -extern API_VAR_EXPORT module *ap_preloaded_modules[];
  +extern AP_DECLARE_DATA module *ap_preloaded_modules[];
   /**
    * Array of all loaded modules
    * @defvar module **ap_loaded_modules
    */
  -extern API_VAR_EXPORT module **ap_loaded_modules;
  +extern AP_DECLARE_DATA module **ap_loaded_modules;
   
   /* For mod_so.c... */
   /** Run a single module's two create_config hooks
  @@ -765,7 +765,7 @@
    * @param process The process that is currently running the server
    * @deffunc void ap_setup_prelinked_modules(process_rec *process)
    */
  -API_EXPORT(void) ap_setup_prelinked_modules(process_rec *process);
  +AP_DECLARE(void) ap_setup_prelinked_modules(process_rec *process);
   
   /**
    *Show the preloaded configuration directives, the help string explaining
  @@ -773,13 +773,13 @@
    * what parts of the configuration they are allowed.  Used for httpd -h.
    * @deffunc void ap_show_directives(void)
    */
  -API_EXPORT(void) ap_show_directives(void);
  +AP_DECLARE(void) ap_show_directives(void);
   
   /** 
    * Show the preloaded module names.  Used for httpd -l. 
    * @deffunc void ap_show_modules(void)
    */
  -API_EXPORT(void) ap_show_modules(void);
  +AP_DECLARE(void) ap_show_modules(void);
   
   /**
    * Read all config files and setup the server
  @@ -790,7 +790,7 @@
    * @return The setup server_rec list.
    * @deffunc server_rec *ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree)
    */
  -API_EXPORT(server_rec*) ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree);
  +AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree);
   
   /**
    * Run all post config hooks for loaded modules.
  @@ -800,21 +800,21 @@
    * @param s The list of server_rec structures
    * @deffunc void ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
    */
  -API_EXPORT(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s);
  +AP_DECLARE(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s);
   
   /**
    * Run all rewrite args hooks for loaded modules
    * @param process The process currently running the server
    * @deffunc void ap_run_rewrite_args(process_rec *process)
    */
  -API_EXPORT(void) ap_run_rewrite_args(process_rec *process);
  +AP_DECLARE(void) ap_run_rewrite_args(process_rec *process);
   
   /**
    * Run the register hooks function for a specified module
    * @param m The module to run the register hooks function fo
    * @deffunc void ap_register_hooks(module *m)
    */
  -API_EXPORT(void) ap_register_hooks(module *m);
  +AP_DECLARE(void) ap_register_hooks(module *m);
   
   /**
    * Setup all virtual hosts
  @@ -822,7 +822,7 @@
    * @param main_server The head of the server_rec list
    * @deffunc void ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server)
    */
  -API_EXPORT(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server);
  +AP_DECLARE(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server);
   
   /* For http_request.c... */
   
  @@ -839,7 +839,7 @@
    * @return The config vector
    * @deffunc void *ap_create_per_dir_config(apr_pool_t *p)
    */
  -CORE_EXPORT(void *) ap_create_per_dir_config(apr_pool_t *p);
  +AP_CORE_DECLARE(void *) ap_create_per_dir_config(apr_pool_t *p);
   
   /**
    * Run all of the modules merge per dir config functions
  @@ -880,7 +880,7 @@
    * return Error string on error, NULL on success
    * @deffunc const char *ap_init_virtual_host(apr_pool_t *p, const char *hostname, server_rec *main_server, server_rec **ps)
    */
  -CORE_EXPORT(const char *) ap_init_virtual_host(apr_pool_t *p, const char *hostname,
  +AP_CORE_DECLARE(const char *) ap_init_virtual_host(apr_pool_t *p, const char *hostname,
   				server_rec *main_server, server_rec **);
   
   /**
  @@ -901,7 +901,7 @@
    * @param p The pool for general allocation
    * @param ptemp The pool for temporary allocations
    */
  -API_EXPORT(void) ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
  +AP_DECLARE(void) ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
                                           apr_pool_t *p, apr_pool_t *ptemp);
   
   
  @@ -931,7 +931,7 @@
    * @return The directive definition of the specified directive
    * @deffunc const command_rec *ap_find_command(const char *name, const command_rec *cmds)
    */
  -CORE_EXPORT(const command_rec *) ap_find_command(const char *name, const command_rec *cmds);
  +AP_CORE_DECLARE(const command_rec *) ap_find_command(const char *name, const command_rec *cmds);
   
   /**
    * Find a given directive in a list module
  @@ -940,7 +940,7 @@
    * @return The directive definition of the specified directive
    * @deffunc const command_rec *ap_find_command_in_modules(const char *cmd_name,module **mod)
    */
  -CORE_EXPORT(const command_rec *) ap_find_command_in_modules(const char *cmd_name, module **mod);
  +AP_CORE_DECLARE(const command_rec *) ap_find_command_in_modules(const char *cmd_name, module **mod);
   
   /**
    * Add a per_dir and per_server config vector to a given module
  @@ -950,7 +950,7 @@
    * @return The new config vector
    * @deffunc void *ap_set_config_vectors(cmd_parms *parms, void *config, module *mod)
    */
  -CORE_EXPORT(void *) ap_set_config_vectors(cmd_parms *parms, void *config, module *mod);
  +AP_CORE_DECLARE(void *) ap_set_config_vectors(cmd_parms *parms, void *config, module *mod);
   
   #endif
   
  
  
  
  1.24      +1 -1      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- http_connection.h	2000/10/02 19:52:33	1.23
  +++ http_connection.h	2000/10/16 06:04:34	1.24
  @@ -98,7 +98,7 @@
    * @param c The connection on which the request is read
    * @deffunc void ap_process_connection(conn_rec *)
    */
  -CORE_EXPORT(void) ap_process_connection(conn_rec *);
  +AP_CORE_DECLARE(void) ap_process_connection(conn_rec *);
   
   /**
    * The http pre-protocol handler.  This makes sets up Apache to serve http
  
  
  
  1.26      +24 -24    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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- http_core.h	2000/10/05 16:54:52	1.25
  +++ http_core.h	2000/10/16 06:04:34	1.26
  @@ -127,21 +127,21 @@
    * @return the Options bitmask
    * @deffunc int ap_allow_options(request_rec *r)
    */
  -API_EXPORT(int) ap_allow_options (request_rec *);
  +AP_DECLARE(int) ap_allow_options (request_rec *);
   /**
    * Retrieve the value of the AllowOverride for this request
    * @param r The current request
    * @return the overrides bitmask
    * @deffunc int ap_allow_overrides(request_rec *r)
    */
  -API_EXPORT(int) ap_allow_overrides (request_rec *);
  +AP_DECLARE(int) ap_allow_overrides (request_rec *);
   /**
    * Retrieve the value of the DefaultType directive, or text/plain if not set
    * @param r The current request
    * @return The default type
    * @deffunc const char *ap_default_type(request_rec *r)
    */
  -API_EXPORT(const char *) ap_default_type (request_rec *);     
  +AP_DECLARE(const char *) ap_default_type (request_rec *);     
   /**
    * Retrieve the document root for this server
    * @param r The current request
  @@ -150,7 +150,7 @@
    * @return The document root
    * @deffunc const char *ap_document_root(request_rec *r)
    */
  -API_EXPORT(const char *) ap_document_root (request_rec *);
  +AP_DECLARE(const char *) ap_document_root (request_rec *);
   /**
    * Lookup the remote client's DNS name or IP address
    * @param conn The current connection
  @@ -173,7 +173,7 @@
    * @return The remote hostname
    * @deffunc const char *ap_get_remote_host(conn_rec *conn, void *dir_config, int type)
    */
  -API_EXPORT(const char *) ap_get_remote_host(conn_rec *conn, void *dir_config, int type);
  +AP_DECLARE(const char *) ap_get_remote_host(conn_rec *conn, void *dir_config, int type);
   /**
    * Retrieve the login name of the remote user.  Undef if it could not be
    * determined
  @@ -181,7 +181,7 @@
    * @return The user logged in to the client machine
    * @deffunc const char *ap_get_remote_logname(request_rec *r)
    */
  -API_EXPORT(const char *) ap_get_remote_logname(request_rec *r);
  +AP_DECLARE(const char *) ap_get_remote_logname(request_rec *r);
   
   /* Used for constructing self-referencing URLs, and things like SERVER_PORT,
    * and SERVER_NAME.
  @@ -194,35 +194,35 @@
    * @return A fully qualified URL
    * @deffunc char *ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r)
    */
  -API_EXPORT(char *) ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r);
  +AP_DECLARE(char *) ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r);
   /**
    * Get the current server name from the request
    * @param r The current request
    * @return the server name
    * @deffunc const char *ap_get_server_name(request_rec *r)
    */
  -API_EXPORT(const char *) ap_get_server_name(request_rec *r);
  +AP_DECLARE(const char *) ap_get_server_name(request_rec *r);
   /**
    * Get the current server port
    * @param The current request
    * @return The server's port
    * @deffunc unsigned ap_get_server_port(const request_rec *r)
    */
  -API_EXPORT(unsigned) ap_get_server_port(const request_rec *r);
  +AP_DECLARE(unsigned) ap_get_server_port(const request_rec *r);
   /**
    * Return the limit on bytes in request msg body 
    * @param r The current request
    * @return the maximum number of bytes in the request msg body
    * @deffunc unsigned long ap_get_limit_req_body(const request_rec *r)
    */
  -API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r);
  +AP_DECLARE(unsigned long) ap_get_limit_req_body(const request_rec *r);
   /**
    * Return the limit on bytes in XML request msg body
    * @param r The current request
    * @return the maximum number of bytes in XML request msg body
    * @deffunc size_t ap_get_limit_xml_body(const request_rec *r)
    */
  -API_EXPORT(size_t) ap_get_limit_xml_body(const request_rec *r);
  +AP_DECLARE(size_t) ap_get_limit_xml_body(const request_rec *r);
   /**
    * Install a custom response handler for a given status
    * @param r The current request
  @@ -231,16 +231,16 @@
    *               or a URL
    * @deffunc void ap_custom_response(request_rec *r, int status, char *string)
    */
  -API_EXPORT(void) ap_custom_response(request_rec *r, int status, char *string);
  +AP_DECLARE(void) ap_custom_response(request_rec *r, int status, char *string);
   /**
    * Check for a definition from the server command line
    * @param name The define to check for
    * @return 1 if defined, 0 otherwise
    * @deffunc int ap_exists_config_define(const char *name)
    */
  -API_EXPORT(int) ap_exists_config_define(const char *name);
  +AP_DECLARE(int) ap_exists_config_define(const char *name);
   /* FIXME! See STATUS about how */
  -API_EXPORT_NONSTD(int) ap_core_translate(request_rec *r);
  +AP_DECLARE_NONSTD(int) ap_core_translate(request_rec *r);
   
   /* Authentication stuff.  This is one of the places where compatibility
    * with the old config files *really* hurts; they don't discriminate at
  @@ -264,14 +264,14 @@
    * @return The authorization required
    * @deffunc const char *ap_auth_type(request_rec *r)
    */
  -API_EXPORT(const char *) ap_auth_type (request_rec *);
  +AP_DECLARE(const char *) ap_auth_type (request_rec *);
   /**
    * Return the current Authorization realm
    * @param r The current request
    * @return The current authorization realm
    * @deffunc const char *ap_auth_name(request_rec *r)
    */
  -API_EXPORT(const char *) ap_auth_name (request_rec *);     
  +AP_DECLARE(const char *) ap_auth_name (request_rec *);     
   /**
    * How the requires lines must be met.
    * @param r The current request
  @@ -283,14 +283,14 @@
    * </PRE>
    * @deffunc int ap_satisfies(request_rec *r)
    */
  -API_EXPORT(int) ap_satisfies (request_rec *r);
  +AP_DECLARE(int) ap_satisfies (request_rec *r);
   /**
    * Retrieve information about all of the requires directives for this request
    * @param r The current request
    * @return An array of all requires directives for this request
    * @deffunc const apr_array_header_t *ap_requires(request_rec *r)
    */
  -API_EXPORT(const apr_array_header_t *) ap_requires (request_rec *);    
  +AP_DECLARE(const apr_array_header_t *) ap_requires (request_rec *);    
   
   #ifdef WIN32
   /* 
  @@ -301,7 +301,7 @@
   typedef enum { INTERPRETER_SOURCE_UNSET, INTERPRETER_SOURCE_REGISTRY_STRICT, 
                  INTERPRETER_SOURCE_REGISTRY, INTERPRETER_SOURCE_SHEBANG 
                } interpreter_source_e;
  -API_EXPORT(file_type_e) ap_get_win32_interpreter(const request_rec *, 
  +AP_DECLARE(file_type_e) ap_get_win32_interpreter(const request_rec *, 
                                                    char **interpreter,
                                                    char **arguments);
   #endif
  @@ -316,7 +316,7 @@
   
   char *ap_response_code_string (request_rec *r, int error_index);
   
  -extern API_VAR_EXPORT module core_module;
  +extern AP_DECLARE_DATA module core_module;
   
   /* Per-directory configuration */
   
  @@ -451,10 +451,10 @@
   void ap_core_reorder_directories(apr_pool_t *, server_rec *);
   
   /* for mod_perl */
  -CORE_EXPORT(void) ap_add_per_dir_conf (server_rec *s, void *dir_config);
  -CORE_EXPORT(void) ap_add_per_url_conf (server_rec *s, void *url_config);
  -CORE_EXPORT(void) ap_add_file_conf(core_dir_config *conf, void *url_config);
  -CORE_EXPORT_NONSTD(const char *) ap_limit_section (cmd_parms *cmd, void *dummy, const char *arg);
  +AP_CORE_DECLARE(void) ap_add_per_dir_conf (server_rec *s, void *dir_config);
  +AP_CORE_DECLARE(void) ap_add_per_url_conf (server_rec *s, void *url_config);
  +AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config);
  +AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section (cmd_parms *cmd, void *dummy, const char *arg);
   
   #endif
   
  
  
  
  1.20      +6 -6      apache-2.0/src/include/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- http_log.h	2000/08/05 17:32:08	1.19
  +++ http_log.h	2000/10/16 06:04:34	1.20
  @@ -149,7 +149,7 @@
    * untrusted data.
    * @deffunc void ap_log_error(const char *file, int line, int level, apr_status_t status, const server_rec *s, const char *fmt, ...) 
    */
  -API_EXPORT(void) ap_log_error(const char *file, int line, int level, 
  +AP_DECLARE(void) ap_log_error(const char *file, int line, int level, 
                                apr_status_t status, const server_rec *s, 
                                const char *fmt, ...)
   			    __attribute__((format(printf,6,7)));
  @@ -173,7 +173,7 @@
    * untrusted data.
    * @deffunc void ap_log_error(const char *file, int line, int level, apr_status_t status, apr_pool_t *p, const char *fmt, ...) 
    */
  -API_EXPORT(void) ap_log_perror(const char *file, int line, int level, 
  +AP_DECLARE(void) ap_log_perror(const char *file, int line, int level, 
                                apr_status_t status, apr_pool_t *p, 
                                const char *fmt, ...)
   			    __attribute__((format(printf,6,7)));
  @@ -197,7 +197,7 @@
    * untrusted data.
    * @deffunc void ap_log_error(const char *file, int line, int level, apr_status_t status, request_rec *s, const char *fmt, ...) 
    */
  -API_EXPORT(void) ap_log_rerror(const char *file, int line, int level, 
  +AP_DECLARE(void) ap_log_rerror(const char *file, int line, int level, 
                                  apr_status_t status, const request_rec *s, 
                                  const char *fmt, ...)
   			    __attribute__((format(printf,6,7)));
  @@ -207,7 +207,7 @@
    * @param s The current server
    * @deffunc void ap_error_log2stderr(server_rec *s)
    */
  -API_EXPORT(void) ap_error_log2stderr (server_rec *);
  +AP_DECLARE(void) ap_error_log2stderr (server_rec *);
   
   /**
    * Log the current pid of the parent process
  @@ -244,14 +244,14 @@
    * @return The piped log structure
    * @deffunc piped_log *ap_open_piped_log(apr_pool_t *p, const char *program)
    */
  -API_EXPORT(piped_log *) ap_open_piped_log (apr_pool_t *p, const char *program);
  +AP_DECLARE(piped_log *) ap_open_piped_log (apr_pool_t *p, const char *program);
   
   /**
    * Close the piped log and kill the logging process
    * @param pl The piped log structure
    * @deffunc void ap_close_piped_log(piped_log *pl)
    */
  -API_EXPORT(void) ap_close_piped_log (piped_log *);
  +AP_DECLARE(void) ap_close_piped_log (piped_log *);
   
   /**
    * A macro to access the read side of the piped log pipe
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- http_main.h	2000/08/05 17:01:07	1.12
  +++ http_main.h	2000/10/16 06:04:34	1.13
  @@ -74,20 +74,20 @@
    */
   
   /** The name of the Apache executable */
  -extern API_VAR_EXPORT const char *ap_server_argv0;
  +extern AP_DECLARE_DATA const char *ap_server_argv0;
   /** The global server's ServerRoot */
  -extern API_VAR_EXPORT const char *ap_server_root;
  +extern AP_DECLARE_DATA const char *ap_server_root;
   
   /* for -C, -c and -D switches */
   /** An array of all -C directives.  These are processed before the server's
    *  config file */
  -extern API_VAR_EXPORT apr_array_header_t *ap_server_pre_read_config;
  +extern AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config;
   /** An array of all -c directives.  These are processed after the server's
    *  config file */
  -extern API_VAR_EXPORT apr_array_header_t *ap_server_post_read_config;
  +extern AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config;
   /** An array of all -D defines on the command line.  This allows people to
    *  effect the server based on command line options */
  -extern API_VAR_EXPORT apr_array_header_t *ap_server_config_defines;
  +extern AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
   
   #ifdef __cplusplus
   }
  
  
  
  1.29      +45 -45    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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- http_protocol.h	2000/10/12 16:35:37	1.28
  +++ http_protocol.h	2000/10/16 06:04:34	1.29
  @@ -92,7 +92,7 @@
    * @param fieldval The value of the header
    * @deffunc int ap_send_header_field(request_rec *r, const char *fieldname, const char *fieldval)
    */
  -API_EXPORT_NONSTD(int) ap_send_header_field(request_rec *r, const char *fieldname,
  +AP_DECLARE_NONSTD(int) ap_send_header_field(request_rec *r, const char *fieldname,
                         const char *fieldval);
   
   /**
  @@ -103,18 +103,18 @@
    *          correctness depends on code in ap_send_http_header().
    * @deffunc void ap_basic_http_header(request_rec *r)
    */
  -API_EXPORT(void) ap_basic_http_header(request_rec *r);
  +AP_DECLARE(void) ap_basic_http_header(request_rec *r);
   
   /**
    * Send the Status-Line and header fields for HTTP response
    * @param l The current request
    * @deffunc void ap_send_http_header(request_rec *l)
    */
  -API_EXPORT(void) ap_send_http_header(request_rec *l);
  +AP_DECLARE(void) ap_send_http_header(request_rec *l);
   
   /* Send the response to special method requests */
   
  -API_EXPORT(int) ap_send_http_trace(request_rec *r);
  +AP_DECLARE(int) ap_send_http_trace(request_rec *r);
   int ap_send_http_options(request_rec *r);
   
   /* Finish up stuff after a request */
  @@ -125,7 +125,7 @@
    * @param r The current request
    * @deffunc void ap_finalize_request_protocol(request_rec *r)
    */
  -API_EXPORT(void) ap_finalize_request_protocol(request_rec *r);
  +AP_DECLARE(void) ap_finalize_request_protocol(request_rec *r);
   
   /**
    * Send error back to client.
  @@ -137,7 +137,7 @@
    *      on the problem with the ErrorDocument.
    * @deffunc void ap_send_error_response(request_rec *r, int recursive_error)
    */
  -API_EXPORT(void) ap_send_error_response(request_rec *r, int recursive_error);
  +AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error);
   
   /* Set last modified header line from the lastmod date of the associated file.
    * Also, set content length.
  @@ -153,14 +153,14 @@
    * @return Always 0, can be safely ignored
    * @deffunc int ap_set_content_length(request_rec *r, long length)
    */
  -API_EXPORT(int) ap_set_content_length(request_rec *r, long length);
  +AP_DECLARE(int) ap_set_content_length(request_rec *r, long length);
   /**
    * Set the keepalive status for this request
    * @param r The current request
    * @return 1 if keepalive can be set, 0 otherwise
    * @deffunc int ap_set_keepalive(request_rec *r)
    */
  -API_EXPORT(int) ap_set_keepalive(request_rec *r);
  +AP_DECLARE(int) ap_set_keepalive(request_rec *r);
   /**
    * Return the latest rational time from a request/mtime pair.  Mtime is 
    * returned unless it's in the future, in which case we return the current time.
  @@ -169,7 +169,7 @@
    * @return the latest rational time.
    * @deffunc apr_time_t ap_rationalize_mtime(request_rec *r, apr_time_t mtime)
    */
  -API_EXPORT(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime);
  +AP_DECLARE(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime);
   /**
    * Construct an entity tag from the resource information.  If it's a real
    * file, build in some of the file characteristics.
  @@ -179,19 +179,19 @@
    * @return The entity tag
    * @deffunc char *ap_make_etag(request_rec *r, int force_weak)
    */ 
  -API_EXPORT(char *) ap_make_etag(request_rec *r, int force_weak);
  +AP_DECLARE(char *) ap_make_etag(request_rec *r, int force_weak);
   /**
    * Set the E-tag outgoing header
    * @param The current request
    * @deffunc void ap_set_etag(request_rec *r)
    */
  -API_EXPORT(void) ap_set_etag(request_rec *r);
  +AP_DECLARE(void) ap_set_etag(request_rec *r);
   /**
    * Set the last modified time for the file being sent
    * @param r The current request
    * @deffunc void ap_set_last_modified(request_rec *r)
    */
  -API_EXPORT(void) ap_set_last_modified(request_rec *r);
  +AP_DECLARE(void) ap_set_last_modified(request_rec *r);
   /**
    * Implements condition GET rules for HTTP/1.1 specification.  This function
    * inspects the client headers and determines if the response fulfills 
  @@ -200,7 +200,7 @@
    * @return 1 if the response fulfills the condition GET rules, 0 otherwise
    * @deffunc int ap_meets_conditions(request_rec *r)
    */
  -API_EXPORT(int) ap_meets_conditions(request_rec *r);
  +AP_DECLARE(int) ap_meets_conditions(request_rec *r);
   
   /* Other ways to send stuff at the client.  All of these keep track
    * of bytes_sent automatically.  This indirection is intended to make
  @@ -223,7 +223,7 @@
    * @param nbytes Amount of data actually sent
    * @deffunc apr_status_t ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, apr_size_t length, apr_size_t *nbytes);
    */
  -API_EXPORT(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
  +AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
                                      apr_size_t length, apr_size_t *nbytes);
   /**
    * Send an MMAP'ed file to the client
  @@ -234,7 +234,7 @@
    * @return The number of bytes sent
    * @deffunc size_t ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset, size_t length)
    */
  -API_EXPORT(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
  +AP_DECLARE(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
                                size_t length);
   
   /**
  @@ -247,14 +247,14 @@
    * @return  Pointer to the newly created structure.
    * @deffunc ap_method_list_t ap_make_method_list(apr_pool_t *p, int nelts)
    */
  -API_EXPORT(ap_method_list_t *) ap_make_method_list(apr_pool_t *p, int nelts);
  -API_EXPORT(void) ap_copy_method_list(ap_method_list_t *dest,
  +AP_DECLARE(ap_method_list_t *) ap_make_method_list(apr_pool_t *p, int nelts);
  +AP_DECLARE(void) ap_copy_method_list(ap_method_list_t *dest,
   				     ap_method_list_t *src);
  -API_EXPORT_NONSTD(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
  +AP_DECLARE_NONSTD(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
   						       int mnum),
   				          void *rec,
   				          const ap_method_list_t *ml, ...);
  -API_EXPORT(void) ap_method_list_vdo(int (*comp) (void *urec, const char *mname,
  +AP_DECLARE(void) ap_method_list_vdo(int (*comp) (void *urec, const char *mname,
   						 int mnum),
   				    void *rec, const ap_method_list_t *ml,
   				    va_list vp);
  @@ -267,7 +267,7 @@
    * @return  1 if method is in the list, otherwise 0
    * @deffunc int ap_method_in_list(const char *method, ap_method_list_t *l)
    */
  -API_EXPORT(int) ap_method_in_list(ap_method_list_t *l, const char *method);
  +AP_DECLARE(int) ap_method_in_list(ap_method_list_t *l, const char *method);
   
   /**
    * Add an HTTP method name to an ap_method_list_t structure if it isn't
  @@ -278,7 +278,7 @@
    * @return  None.
    * @deffunc void ap_method_in_list(ap_method_list_t *l, const char *method)
    */
  -API_EXPORT(void) ap_method_list_add(ap_method_list_t *l, const char *method);
  +AP_DECLARE(void) ap_method_list_add(ap_method_list_t *l, const char *method);
       
   /**
    * Remove an HTTP method name from an ap_method_list_t structure.
  @@ -288,7 +288,7 @@
    * @return  None.
    * @deffunc void ap_method_list_remove(ap_method_list_t *l, const char *method)
    */
  -API_EXPORT(void) ap_method_list_remove(ap_method_list_t *l,
  +AP_DECLARE(void) ap_method_list_remove(ap_method_list_t *l,
   				       const char *method);
   
   /**
  @@ -298,7 +298,7 @@
    * @return  None.
    * @deffunc void ap_clear_method_list(ap_method_list_t *l)
    */
  -API_EXPORT(void) ap_clear_method_list(ap_method_list_t *l);
  +AP_DECLARE(void) ap_clear_method_list(ap_method_list_t *l);
       
   /* Hmmm... could macrofy these for now, and maybe forever, though the
    * definitions of the macros would get a whole lot hairier.
  @@ -311,7 +311,7 @@
    * @return The number of bytes sent
    * @deffunc int ap_rputc(int c, request_rec *r)
    */
  -API_EXPORT(int) ap_rputc(int c, request_rec *r);
  +AP_DECLARE(int) ap_rputc(int c, request_rec *r);
   /**
    * Output a string for the current request
    * @param str The string to output
  @@ -319,7 +319,7 @@
    * @return The number of bytes sent
    * @deffunc int ap_rputs(const char *str, request_rec *r)
    */
  -API_EXPORT(int) ap_rputs(const char *str, request_rec *r);
  +AP_DECLARE(int) ap_rputs(const char *str, request_rec *r);
   /**
    * Write a buffer for the current request
    * @param buf The buffer to write
  @@ -328,7 +328,7 @@
    * @return The number of bytes sent
    * @deffunc int ap_rwrite(const void *buf, int nbyte, request_rec *r)
    */
  -API_EXPORT(int) ap_rwrite(const void *buf, int nbyte, request_rec *r);
  +AP_DECLARE(int) ap_rwrite(const void *buf, int nbyte, request_rec *r);
   /**
    * Write an unspecified number of strings to the request
    * @param r The current request
  @@ -336,7 +336,7 @@
    * @return The number of bytes sent
    * @deffunc int ap_rvputs(request_rec *r, ...)
    */
  -API_EXPORT_NONSTD(int) ap_rvputs(request_rec *r,...);
  +AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r,...);
   /**
    * Output data to the client in a printf format
    * @param r The current request
  @@ -345,7 +345,7 @@
    * @return The number of bytes sent
    * @deffunc int ap_vrprintf(request_rec *r, const char *fmt, va_list vlist)
    */
  -API_EXPORT(int) ap_vrprintf(request_rec *r, const char *fmt, va_list vlist);
  +AP_DECLARE(int) ap_vrprintf(request_rec *r, const char *fmt, va_list vlist);
   /**
    * Output data to the client in a printf format
    * @param r The current request
  @@ -354,7 +354,7 @@
    * @return The number of bytes sent
    * @deffunc int ap_rprintf(request_rec *r, const char *fmt, ...)
    */
  -API_EXPORT_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
  +AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
   				__attribute__((format(printf,2,3)));
   /**
    * Flush all of the data for the current request to the client
  @@ -362,7 +362,7 @@
    * @return The number of bytes sent
    * @deffunc int ap_rflush(request_rec *r)
    */
  -API_EXPORT(int) ap_rflush(request_rec *r);
  +AP_DECLARE(int) ap_rflush(request_rec *r);
   
   /**
    * Index used in custom_responses array for a specific error code
  @@ -371,7 +371,7 @@
    * @return The index of the response
    * @deffunc int ap_index_of_response(int status)
    */
  -API_EXPORT(int) ap_index_of_response(int status);
  +AP_DECLARE(int) ap_index_of_response(int status);
   
   /** 
    * Return the Status-Line for a given status code (excluding the
  @@ -381,7 +381,7 @@
    * @return The Status-Line
    * @deffunc const char *ap_get_status_line(int status)
    */
  -API_EXPORT(const char *) ap_get_status_line(int status);
  +AP_DECLARE(const char *) ap_get_status_line(int status);
   
   /* Reading a block of data from the client connection (e.g., POST arg) */
   
  @@ -398,7 +398,7 @@
    * @return either OK or an error code
    * @deffunc int ap_setup_cleint_block(request_rec *r, int read_policy)
    */
  -API_EXPORT(int) ap_setup_client_block(request_rec *r, int read_policy);
  +AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy);
   /**
    * Determine if the client has sent any data.  This also sends a 
    * 100 Continue resposne to HTTP/1.1 clients, so modules should not be called
  @@ -408,7 +408,7 @@
    * @return 0 if there is no message to read, 1 otherwise
    * @deffunc int ap_should_client_block(request_rec *r)
    */
  -API_EXPORT(int) ap_should_client_block(request_rec *r);
  +AP_DECLARE(int) ap_should_client_block(request_rec *r);
   /**
    * Call this in a loop.  It will put data into a buffer and return the length
    * of the input block
  @@ -419,7 +419,7 @@
    *         if EOF, or -1 if there was an error
    * @deffunc long ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
    */
  -API_EXPORT(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz);
  +AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz);
   /**
    * In HTTP/1.1, any method can have a body.  However, most GET handlers
    * wouldn't know what to do with a request body if they received one.
  @@ -431,7 +431,7 @@
    * @return error status if request is malformed, OK otherwise 
    * @deffunc int ap_discard_request_body(request_rec *r)
    */
  -API_EXPORT(int) ap_discard_request_body(request_rec *r);
  +AP_DECLARE(int) ap_discard_request_body(request_rec *r);
   
   /* Sending a byterange */
   
  @@ -441,7 +441,7 @@
    * @return 1 if request was setup for byte range requests, 0 otherwise
    * @deffunc int ap_set_byterange(request_rec *r)
    */
  -API_EXPORT(int) ap_set_byterange(request_rec *r);
  +AP_DECLARE(int) ap_set_byterange(request_rec *r);
   /**
    * Send one byte range chunk for a byte range request
    * @param r The current request
  @@ -449,7 +449,7 @@
    * @param length Set to the length in should be after the chunk is sent
    * @deffunc int ap_each_byterange(request_rec *r, apr_off_t *offset, apr_size_t *length)
    */
  -API_EXPORT(int) ap_each_byterange(request_rec *r, apr_off_t *offset,
  +AP_DECLARE(int) ap_each_byterange(request_rec *r, apr_off_t *offset,
   				  apr_size_t *length);
   /**
    * Setup the output headers so that the client knows how to authenticate
  @@ -458,7 +458,7 @@
    * @param r The current request
    * @deffunc void ap_note_auth_failure(request_rec *r)
    */ 
  -API_EXPORT(void) ap_note_auth_failure(request_rec *r);
  +AP_DECLARE(void) ap_note_auth_failure(request_rec *r);
   /**
    * Setup the output headers so that the client knows how to authenticate
    * itself the next time, if an authentication request failed.  This function
  @@ -466,7 +466,7 @@
    * @param r The current request
    * @deffunc void ap_note_basic_auth_failure(request_rec *r)
    */ 
  -API_EXPORT(void) ap_note_basic_auth_failure(request_rec *r);
  +AP_DECLARE(void) ap_note_basic_auth_failure(request_rec *r);
   /**
    * Setup the output headers so that the client knows how to authenticate
    * itself the next time, if an authentication request failed.  This function
  @@ -474,7 +474,7 @@
    * @param r The current request
    * @deffunc void ap_note_digest_auth_failure(request_rec *r)
    */ 
  -API_EXPORT(void) ap_note_digest_auth_failure(request_rec *r);
  +AP_DECLARE(void) ap_note_digest_auth_failure(request_rec *r);
   /**
    * Get the password from the request headers
    * @param r The current request
  @@ -488,7 +488,7 @@
    *         decline as well).
    * @deffunc int ap_get_basic_auth_pw(request_rec *r, const char **pw)
    */
  -API_EXPORT(int) ap_get_basic_auth_pw(request_rec *r, const char **pw);
  +AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw);
   
   /*
    * Setting up the protocol fields for subsidiary requests...
  @@ -509,7 +509,7 @@
    * @param uri The uri to break apart
    * @deffunc void ap_parse_uri(request_rec *r, const char *uri)
    */
  -CORE_EXPORT(void) ap_parse_uri(request_rec *r, const char *uri);
  +AP_CORE_DECLARE(void) ap_parse_uri(request_rec *r, const char *uri);
   
   /**
    * Get the method number associated with the given string, assumed to
  @@ -518,7 +518,7 @@
    * @return The method number
    * @deffunc int ap_method_number_of(const char *method)
    */
  -API_EXPORT(int) ap_method_number_of(const char *method);
  +AP_DECLARE(int) ap_method_number_of(const char *method);
   
   /**
    * Get the method name associated with the given internal method
  @@ -527,7 +527,7 @@
    * @return The name corresponding to the method number
    * @deffunc const char *ap_method_name_of(int methnum)
    */
  -API_EXPORT(const char *) ap_method_name_of(int methnum);
  +AP_DECLARE(const char *) ap_method_name_of(int methnum);
   
   int http_filter(ap_filter_t *f, ap_bucket_brigade *b, apr_ssize_t length);
   
  
  
  
  1.17      +12 -12    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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- http_request.h	2000/08/14 02:36:42	1.16
  +++ http_request.h	2000/10/16 06:04:34	1.17
  @@ -97,7 +97,7 @@
    * @return The new request record
    * @deffunc request_rec * ap_sub_req_lookup_uri(const char *new_file, const request_rec *r)
    */
  -API_EXPORT(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
  +AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
                                                const request_rec *r);
   /**
    * Create a sub request for the given file.  This sub request can be
  @@ -107,7 +107,7 @@
    * @return The new request record
    * @deffunc request_rec * ap_sub_req_lookup_file(const char *new_file, const request_rec *r)
    */
  -API_EXPORT(request_rec *) ap_sub_req_lookup_file(const char *new_file,
  +AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file,
                                                 const request_rec *r);
   /**
    * Create a sub request for the given URI using a specific method.  This
  @@ -118,7 +118,7 @@
    * @return The new request record
    * @deffunc request_rec * ap_sub_req_method_uri(const char *method, const char *new_file, const request_rec *r)
    */
  -API_EXPORT(request_rec *) ap_sub_req_method_uri(const char *method,
  +AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
                                                   const char *new_file,
                                                   const request_rec *r);
   
  @@ -128,14 +128,14 @@
    * @return The return code for the sub request
    * @deffunc int ap_run_sub_req(request_rec *r)
    */
  -API_EXPORT(int) ap_run_sub_req(request_rec *r);
  +AP_DECLARE(int) ap_run_sub_req(request_rec *r);
   
   /**
    * Free the memory associated with a sub request
    * @param r The sub request to finish
    * @deffunc void ap_destroy_sub_req(request_rec *r)
    */
  -API_EXPORT(void) ap_destroy_sub_req(request_rec *r);
  +AP_DECLARE(void) ap_destroy_sub_req(request_rec *r);
   
   /*
    * Then there's the case that you want some other request to be served
  @@ -149,7 +149,7 @@
    * @param r The current request
    * @deffunc void ap_internal_redirect(const char *new_uri, request_rec *r)
    */
  -API_EXPORT(void) ap_internal_redirect(const char *new_uri, request_rec *r);
  +AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r);
   
   /**
    * This function is designed for things like actions or CGI scripts, when
  @@ -159,7 +159,7 @@
    * @param r The current request
    * @deffunc void ap_internal_redirect_handler(const char *new_uri, request_rec *r)
    */
  -API_EXPORT(void) ap_internal_redirect_handler(const char *new_uri, request_rec *r);
  +AP_DECLARE(void) ap_internal_redirect_handler(const char *new_uri, request_rec *r);
   
   /**
    * Can be used within any handler to determine if any authentication
  @@ -168,7 +168,7 @@
    * @return 1 if authentication is required, 0 otherwise
    * @deffunc int ap_some_auth_required(request_rec *r)
    */
  -API_EXPORT(int) ap_some_auth_required(request_rec *r);
  +AP_DECLARE(int) ap_some_auth_required(request_rec *r);
    
   /**
    * Determine if the current request is the main request or a sub requests
  @@ -176,7 +176,7 @@
    * @retrn 1 if this is a main request, 0 otherwise
    * @deffunc int ap_is_initial_req(request_rec *r)
    */
  -API_EXPORT(int) ap_is_initial_req(request_rec *r);
  +AP_DECLARE(int) ap_is_initial_req(request_rec *r);
   
   /**
    * Function to set the r->mtime field to the specified value if it's later
  @@ -185,7 +185,7 @@
    * @param dependency_time Time to set the mtime to
    * @deffunc void ap_update_mtime(request_rec *r, apr_time_t dependency_mtime)
    */
  -API_EXPORT(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime);
  +AP_DECLARE(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime);
   
   /**
    * Add one or more methods to the list permitted to access the resource.
  @@ -203,7 +203,7 @@
    * @return  None.
    * @deffunc void ap_allow_methods(request_rec *r, int reset, ...)
    */
  -API_EXPORT(void) ap_allow_methods(request_rec *r, int reset, ...);
  +AP_DECLARE(void) ap_allow_methods(request_rec *r, int reset, ...);
   
   #define MERGE_ALLOW 0
   #define REPLACE_ALLOW 1
  @@ -217,7 +217,7 @@
    * @param r The current request
    * @deffunc void ap_die(int type, request_rec *r)
    */
  -API_EXPORT(void) ap_die(int type, request_rec *r);
  +AP_DECLARE(void) ap_die(int type, request_rec *r);
   #endif
   
     /* Hooks */
  
  
  
  1.9       +1 -1      apache-2.0/src/include/http_vhost.h
  
  Index: http_vhost.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_vhost.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- http_vhost.h	2000/08/06 00:48:14	1.8
  +++ http_vhost.h	2000/10/16 06:04:34	1.9
  @@ -112,7 +112,7 @@
    * return 0 otherwise
    * @deffunc int ap_matches_request_vhost(request_rec *r, const char *host, unsigned port)
    */
  -API_EXPORT(int) ap_matches_request_vhost(request_rec *r, const char *host,
  +AP_DECLARE(int) ap_matches_request_vhost(request_rec *r, const char *host,
       unsigned port);
   
   #ifdef __cplusplus
  
  
  
  1.103     +76 -76    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.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- httpd.h	2000/10/14 04:37:22	1.102
  +++ httpd.h	2000/10/16 06:04:34	1.103
  @@ -373,7 +373,7 @@
    * @return The server version string
    * @deffunc const char *ap_get_server_version(void)
    */
  -API_EXPORT(const char *) ap_get_server_version(void);
  +AP_DECLARE(const char *) ap_get_server_version(void);
   
   /**
    * Add a component to the version string
  @@ -381,13 +381,13 @@
    * @param component The string to add
    * @deffunc void ap_add_version_component(apr_pool_t *pconf, const char *component)
    */
  -API_EXPORT(void) ap_add_version_component(apr_pool_t *pconf, const char *component);
  +AP_DECLARE(void) ap_add_version_component(apr_pool_t *pconf, const char *component);
   
   /**
    * Get the date a time that the server was built
    * @return The server build time string
    */
  -API_EXPORT(const char *) ap_get_server_built(void);
  +AP_DECLARE(const char *) ap_get_server_built(void);
   
   /* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
    * Always increases along the same track as the source branch.
  @@ -1008,37 +1008,37 @@
       int limit_req_fields; 
   };
   
  -/* stuff marked API_EXPORT is part of the API, and intended for use
  +/* stuff marked AP_DECLARE is part of the API, and intended for use
    * by modules
    */
  -#ifndef API_EXPORT
  -#define API_EXPORT(type)    type
  +#ifndef AP_DECLARE
  +#define AP_DECLARE(type)    type
   #endif
   
  -/* Stuff marked API_EXPORT_NONSTD is part of the API, and intended for
  - * use by modules.  The difference between API_EXPORT and
  - * API_EXPORT_NONSTD is that the latter is required for any functions
  +/* Stuff marked AP_DECLARE_NONSTD is part of the API, and intended for
  + * use by modules.  The difference between AP_DECLARE and
  + * AP_DECLARE_NONSTD is that the latter is required for any functions
    * which use varargs or are used via indirect function call.  This
    * is to accomodate the two calling conventions in windows dlls.
    */
  -#ifndef API_EXPORT_NONSTD
  -#define API_EXPORT_NONSTD(type)    type
  +#ifndef AP_DECLARE_NONSTD
  +#define AP_DECLARE_NONSTD(type)    type
   #endif
   
  -#ifndef MODULE_VAR_EXPORT
  -#define MODULE_VAR_EXPORT
  +#ifndef AP_MODULE_DECLARE_DATA
  +#define AP_MODULE_DECLARE_DATA
   #endif
  -#ifndef API_VAR_EXPORT
  -#define API_VAR_EXPORT
  +#ifndef AP_DECLARE_DATA
  +#define AP_DECLARE_DATA
   #endif
   
  -/* modules should not used functions marked CORE_EXPORT
  - * or CORE_EXPORT_NONSTD */
  -#ifndef CORE_EXPORT
  -#define CORE_EXPORT	API_EXPORT
  +/* modules should not used functions marked AP_CORE_DECLARE
  + * or AP_CORE_DECLARE_NONSTD */
  +#ifndef AP_CORE_DECLARE
  +#define AP_CORE_DECLARE	AP_DECLARE
   #endif
  -#ifndef CORE_EXPORT_NONSTD
  -#define CORE_EXPORT_NONSTD	API_EXPORT_NONSTD
  +#ifndef AP_CORE_DECLARE_NONSTD
  +#define AP_CORE_DECLARE_NONSTD	AP_DECLARE_NONSTD
   #endif
   
   /* On Mac OS X Server, symbols that conflict with loaded dylibs
  @@ -1062,7 +1062,7 @@
    * @return the field minus any parameters
    * @deffunc char *ap_field_noparam(apr_pool_t *p, const char *intype);
    */
  -API_EXPORT(char *) ap_field_noparam(apr_pool_t *p, const char *intype);
  +AP_DECLARE(char *) ap_field_noparam(apr_pool_t *p, const char *intype);
   
   /**
    * Convert a time from an integer into a string in a specified format
  @@ -1073,7 +1073,7 @@
    * @return The string that represents the specified time
    * @deffunc char *ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int gmt)
    */
  -API_EXPORT(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int gmt);
  +AP_DECLARE(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int gmt);
   
   /* String handling. The *_nc variants allow you to use non-const char **s as
      arguments (unfortunately C won't automatically convert a char ** to a const
  @@ -1087,7 +1087,7 @@
    * @return A copy of the characters up to the first stop character
    * @deffunc char *ap_getword(apr_pool_t *p, const char **line, char stop);
    */
  -API_EXPORT(char *) ap_getword(apr_pool_t *p, const char **line, char stop);
  +AP_DECLARE(char *) ap_getword(apr_pool_t *p, const char **line, char stop);
   /**
    * Get the characters until the first occurance of a specified character
    * @param p The pool to allocate memory out of
  @@ -1097,7 +1097,7 @@
    * @tip This is the same as ap_getword, except it doesn't use const char **.
    * @deffunc char *ap_getword_nc(apr_pool_t *p, char **line, char stop);
    */
  -API_EXPORT(char *) ap_getword_nc(apr_pool_t *p, char **line, char stop);
  +AP_DECLARE(char *) ap_getword_nc(apr_pool_t *p, char **line, char stop);
   
   /**
    * Get the first word from a given string.  A word is defined as all characters
  @@ -1107,7 +1107,7 @@
    * @retrn The first word in the line
    * @deffunc char *ap_getword_white(apr_pool_t *p, const char **line)
    */
  -API_EXPORT(char *) ap_getword_white(apr_pool_t *p, const char **line);
  +AP_DECLARE(char *) ap_getword_white(apr_pool_t *p, const char **line);
   /**
    * Get the first word from a given string.  A word is defined as all characters
    * up to the first whitespace.
  @@ -1117,7 +1117,7 @@
    * @tip The same as ap_getword_white, except it doesn't use const char **.
    * @deffunc char *ap_getword_white_nc(apr_pool_t *p, const char **line)
    */
  -API_EXPORT(char *) ap_getword_white_nc(apr_pool_t *p, char **line);
  +AP_DECLARE(char *) ap_getword_white_nc(apr_pool_t *p, char **line);
   
   /**
    * Get all characters from the first occurance of stop to the first '\0'
  @@ -1128,7 +1128,7 @@
    *         character
    * @deffunc char *ap_getword_nulls(apr_pool_t *p, const char **line, char stop)
    */
  -API_EXPORT(char *) ap_getword_nulls(apr_pool_t *p, const char **line, char stop);
  +AP_DECLARE(char *) ap_getword_nulls(apr_pool_t *p, const char **line, char stop);
   /**
    * Get all characters from the first occurance of stop to the first '\0'
    * @param p The pool to allocate memory out of
  @@ -1139,7 +1139,7 @@
    * @tip The same as ap_getword_nulls, except it doesn't use const char **.
    * @deffunc char *ap_getword_nulls_nc(apr_pool_t *p, char **line, char stop)
    */
  -API_EXPORT(char *) ap_getword_nulls_nc(apr_pool_t *p, char **line, char stop);
  +AP_DECLARE(char *) ap_getword_nulls_nc(apr_pool_t *p, char **line, char stop);
   
   /**
    * Get the second word in the string paying attention to quoting
  @@ -1148,7 +1148,7 @@
    * @return A copy of the string
    * @deffunc char *ap_getword_conf(apr_pool_t *p, const char **line)
    */
  -API_EXPORT(char *) ap_getword_conf(apr_pool_t *p, const char **line);
  +AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p, const char **line);
   /**
    * Get the second word in the string paying attention to quoting
    * @param p The pool to allocate out of
  @@ -1157,7 +1157,7 @@
    * @tip The same as ap_getword_conf, except it doesn't use const char **.
    * @deffunc char *ap_getword_conf_nc(apr_pool_t *p, char **line)
    */
  -API_EXPORT(char *) ap_getword_conf_nc(apr_pool_t *p, char **line);
  +AP_DECLARE(char *) ap_getword_conf_nc(apr_pool_t *p, char **line);
   
   /**
    * Check a string for any ${ENV} environment variable construct and replace 
  @@ -1169,7 +1169,7 @@
    * @return The string with the replaced environment variables
    * @deffunc const char *ap_resolve_env(apr_pool_t *p, const char *word)
    */
  -API_EXPORT(const char *) ap_resolve_env(apr_pool_t *p, const char * word); 
  +AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word); 
   
   /**
    * Size an HTTP header field list item, as separated by a comma.
  @@ -1181,7 +1181,7 @@
    * character.  len is the length of the item excluding any beginning whitespace.
    * @deffunc const char *ap_size_list_item(const char **field, int *len)
    */
  -API_EXPORT(const char *) ap_size_list_item(const char **field, int *len);
  +AP_DECLARE(const char *) ap_size_list_item(const char **field, int *len);
   
   /**
    * Retrieve an HTTP header field list item, as separated by a comma,
  @@ -1194,7 +1194,7 @@
    *         shifted to the next non-comma, non-whitespace.
    * @deffunc char *ap_get_list_item(apr_pool_t *p, const char **field)
    */
  -API_EXPORT(char *) ap_get_list_item(apr_pool_t *p, const char **field);
  +AP_DECLARE(char *) ap_get_list_item(apr_pool_t *p, const char **field);
   
   /**
    * Find an item in canonical form (lowercase, no extra spaces) within
  @@ -1205,7 +1205,7 @@
    * @return 1 if found, 0 if not found.
    * @deffunc int ap_find_list_item(apr_pool_t *p, const char *line, const char *tok)
    */
  -API_EXPORT(int) ap_find_list_item(apr_pool_t *p, const char *line, const char *tok);
  +AP_DECLARE(int) ap_find_list_item(apr_pool_t *p, const char *line, const char *tok);
   
   /**
    * Retrieve a token, spacing over it and returning a pointer to
  @@ -1218,7 +1218,7 @@
    * @return the first non-white byte after the token
    * @deffunc char *ap_get_token(apr_pool_t *p, const char **accept_line, int accept_white)
    */
  -API_EXPORT(char *) ap_get_token(apr_pool_t *p, const char **accept_line, int accept_white);
  +AP_DECLARE(char *) ap_get_token(apr_pool_t *p, const char **accept_line, int accept_white);
   
   /**
    * find http tokens, see the definition of token from RFC2068 
  @@ -1228,7 +1228,7 @@
    * @return 1 if the token is found, 0 otherwise
    * @deffunc int ap_find_token(apr_pool_t *p, const char *line, const char *tok)
    */
  -API_EXPORT(int) ap_find_token(apr_pool_t *p, const char *line, const char *tok);
  +AP_DECLARE(int) ap_find_token(apr_pool_t *p, const char *line, const char *tok);
   
   /**
    * find http tokens from the end of the line
  @@ -1238,7 +1238,7 @@
    * @return 1 if the token is found, 0 otherwise
    * @deffunc int ap_find_last_token(apr_pool_t *p, const char *line, const char *tok)
    */
  -API_EXPORT(int) ap_find_last_token(apr_pool_t *p, const char *line, const char *tok);
  +AP_DECLARE(int) ap_find_last_token(apr_pool_t *p, const char *line, const char *tok);
   
   /**
    * Check for an Absolute URI syntax
  @@ -1246,7 +1246,7 @@
    * @return 1 if URI, 0 otherwise
    * @deffunc int ap_is_url(const char *u)
    */
  -API_EXPORT(int) ap_is_url(const char *u);
  +AP_DECLARE(int) ap_is_url(const char *u);
   
   /**
    * Unescape a URL
  @@ -1254,20 +1254,20 @@
    * @return 0 on success, non-zero otherwise
    * @deffunc int ap_unescape_url(char *url)
    */
  -API_EXPORT(int) ap_unescape_url(char *url);
  +AP_DECLARE(int) ap_unescape_url(char *url);
   /**
    * Remove all double slashes from a string
    * @param name The string to parse
    * @deffunc void ap_no2slash(char *name)
    */
  -API_EXPORT(void) ap_no2slash(char *name);
  +AP_DECLARE(void) ap_no2slash(char *name);
   
   /**
    * Remove all ./ and ../ substrings from a file name
    * @param name the file name to parse
    * @deffunc void ap_getparents(char *name)
    */
  -API_EXPORT(void) ap_getparents(char *name);
  +AP_DECLARE(void) ap_getparents(char *name);
   
   /**
    * Escape a path segment, as defined in RFC 1808
  @@ -1276,7 +1276,7 @@
    * @return The converted URL
    * @deffunc char *ap_escape_path_segment(apr_pool_t *p, const char *s)
    */
  -API_EXPORT(char *) ap_escape_path_segment(apr_pool_t *p, const char *s);
  +AP_DECLARE(char *) ap_escape_path_segment(apr_pool_t *p, const char *s);
   /**
    * convert an OS path to a URL in an OS dependant way.
    * @param p The pool to allocate out of
  @@ -1286,7 +1286,7 @@
    * @return The converted URL
    * @deffunc char *ap_os_escape_path(apr_pool_t *p, const char *path, int partial)
    */
  -API_EXPORT(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partial);
  +AP_DECLARE(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partial);
   #define ap_escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
   
   /**
  @@ -1296,7 +1296,7 @@
    * @return The escaped string
    * @deffunc char *ap_escape_html(apr_pool_t *p, const char *s)
    */
  -API_EXPORT(char *) ap_escape_html(apr_pool_t *p, const char *s);
  +AP_DECLARE(char *) ap_escape_html(apr_pool_t *p, const char *s);
   
   /**
    * Construct a full hostname
  @@ -1307,7 +1307,7 @@
    * @return The server's hostname
    * @deffunc char *ap_construct_server(apr_pool_t *p, const char *hostname, unsiged port, const request_rec *r)
    */
  -API_EXPORT(char *) ap_construct_server(apr_pool_t *p, const char *hostname,
  +AP_DECLARE(char *) ap_construct_server(apr_pool_t *p, const char *hostname,
   				    unsigned port, const request_rec *r);
   /**
    * Escape a shell command
  @@ -1316,7 +1316,7 @@
    * @return The escaped hostname
    * @deffunc char *ap_escape_shell_cmd(apr_pool_t *p, const char *s)
    */
  -API_EXPORT(char *) ap_escape_shell_cmd(apr_pool_t *p, const char *s);
  +AP_DECLARE(char *) ap_escape_shell_cmd(apr_pool_t *p, const char *s);
   
   /**
    * Count the number of directories in a path
  @@ -1324,7 +1324,7 @@
    * @return The number of directories
    * @deffunc int ap_count_dirs(const char *path)
    */
  -API_EXPORT(int) ap_count_dirs(const char *path);
  +AP_DECLARE(int) ap_count_dirs(const char *path);
   /**
    * Copy at most n leading directories of s into d d should be at least as 
    * large as s plus 1 extra byte
  @@ -1337,7 +1337,7 @@
    * whereas n = 1 returns the "d:/" root.  On all other platforms, n = 0
    * returns the empty string.
    */
  -API_EXPORT(char *) ap_make_dirstr_prefix(char *d, const char *s, int n);
  +AP_DECLARE(char *) ap_make_dirstr_prefix(char *d, const char *s, int n);
   /**
    * return the parent directory name including trailing / of the file s
    * @param p The pool to allocate out of
  @@ -1345,7 +1345,7 @@
    * @return A copy of the file's parent directory
    * @deffunc char *ap_make_dirstr_parent(apr_pool_t *p, const char *s)
    */
  -API_EXPORT(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s);
  +AP_DECLARE(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s);
   
   /**
    * Given a directory and filename, create a single path out of them.  This
  @@ -1357,7 +1357,7 @@
    * @return A copy of the full path
    * @deffunc char *ap_make_full_path(apr_pool_t *a, const char *dir, const char *f)
    */
  -API_EXPORT(char *) ap_make_full_path(apr_pool_t *a, const char *dir, const char *f);
  +AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *dir, const char *f);
   
   /**
    * Does the provided string contain wildcard characters?  This is useful
  @@ -1367,7 +1367,7 @@
    * @return 1 if the string has wildcards, 0 otherwise
    * @deffunc int ap_is_matchexp(const char *str)
    */
  -API_EXPORT(int) ap_is_matchexp(const char *str);
  +AP_DECLARE(int) ap_is_matchexp(const char *str);
   
   /**
    * Determine if a string matches a patterm containing the wildcards '?' or '*'
  @@ -1376,7 +1376,7 @@
    * @return 1 if the two strings match, 0 otherwise
    * @deffunc int ap_strcmp_match(const char *str, const char *exp)
    */
  -API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp);
  +AP_DECLARE(int) ap_strcmp_match(const char *str, const char *exp);
   /**
    * Determine if a string matches a patterm containing the wildcards '?' or '*',
    * ignoring case
  @@ -1385,7 +1385,7 @@
    * @return 1 if the two strings match, 0 otherwise
    * @deffunc int ap_strcasecmp_match(const char *str, const char *exp)
    */
  -API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp);
  +AP_DECLARE(int) ap_strcasecmp_match(const char *str, const char *exp);
   
   /**
    * Find the first occurrence of the substring s2 in s1, regardless of case
  @@ -1394,7 +1394,7 @@
    * @return A pointer to the beginning of the substring
    * @deffunc char *ap_strcasestr(const char *s1, const char *s2)
    */
  -API_EXPORT(char *) ap_strcasestr(const char *s1, const char *s2);
  +AP_DECLARE(char *) ap_strcasestr(const char *s1, const char *s2);
   
   /**
    * Return a pointer to the location inside of bigstring immediately after prefix
  @@ -1403,7 +1403,7 @@
    * @return A pointer relative to bigstring after prefix
    * deffunc char *ap_stripprefix(const char *bigstring, const char *prefix);
    */
  -API_EXPORT(char *) ap_stripprefix(const char *bigstring, const char *prefix);
  +AP_DECLARE(char *) ap_stripprefix(const char *bigstring, const char *prefix);
   
   /**
    * Decode a base64 encoded string into memory allocated out of a pool
  @@ -1412,7 +1412,7 @@
    * @return The decoded string
    * @deffunc char *ap_pbase64decode(apr_pool_t *p, const char *bufcoded)
    */
  -API_EXPORT(char *) ap_pbase64decode(apr_pool_t *p, const char *bufcoded);
  +AP_DECLARE(char *) ap_pbase64decode(apr_pool_t *p, const char *bufcoded);
   
   /**
    * Encode a string into memory allocated out of a pool in base 64 format
  @@ -1421,7 +1421,7 @@
    * @return The encoded string
    * @deffunc char *ap_pbase64encode(apr_pool_t *p, char *string)
    */
  -API_EXPORT(char *) ap_pbase64encode(apr_pool_t *p, char *string); 
  +AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string); 
   
   #include "pcreposix.h"
   
  @@ -1439,7 +1439,7 @@
    * @return The compiled regular expression
    * @deffunc regex_t *ap_pregcomp(apr_pool_t *p, const char *pattern, int cflags)
    */
  -API_EXPORT(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
  +AP_DECLARE(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
   				   int cflags);
   /**
    * Free the memory associated with a compiled regular expression
  @@ -1447,7 +1447,7 @@
    * @param reg The regular expression to free
    * @deffunc void ap_pregfree(apr_pool_t *p, regex_t *reg)
    */
  -API_EXPORT(void) ap_pregfree(apr_pool_t *p, regex_t *reg);
  +AP_DECLARE(void) ap_pregfree(apr_pool_t *p, regex_t *reg);
   
   /**
    * Match a null-terminated string against a pre-compiled regex.
  @@ -1463,7 +1463,7 @@
    * @return 0 for successful match, REG_NOMATCH otherwise
    * @deffunc int ap_regexec(regex_t *preg, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags)
    */ 
  -API_EXPORT(int)    ap_regexec(regex_t *preg, const char *string,
  +AP_DECLARE(int)    ap_regexec(regex_t *preg, const char *string,
                                 size_t nmatch, regmatch_t pmatch[], int eflags);
   
   /**
  @@ -1474,7 +1474,7 @@
    * @param errbuf_size The size of the buffer
    * @deffunc size_t ap_regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
    */
  -API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, 
  +AP_DECLARE(size_t) ap_regerror(int errcode, const regex_t *preg, 
                                  char *errbuf, size_t errbuf_size);
   
   /**
  @@ -1489,7 +1489,7 @@
    * @param pmatch the pmatch array returned from ap_pregex
    * @deffunc char *ap_pregsub(apr_pool_t *p, const char *input, const char *source, size_t nmatch, regmatch_t pmatch[])
    */
  -API_EXPORT(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,
  +AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,
                                 size_t nmatch, regmatch_t pmatch[]);
   
   /**
  @@ -1498,13 +1498,13 @@
    * @param s The content-type to convert to lowercase
    * @deffunc void ap_content_type_tolower(char *s)
    */
  -API_EXPORT(void) ap_content_type_tolower(char *s);
  +AP_DECLARE(void) ap_content_type_tolower(char *s);
   /**
    * convert a string to all lowercase
    * @param s The string to convert to lowercase 
    * @deffunc void ap_str_tolower(char *s) 
    */
  -API_EXPORT(void) ap_str_tolower(char *s);
  +AP_DECLARE(void) ap_str_tolower(char *s);
   
   /**
    * Search a string from left to right for the first occurrence of a 
  @@ -1514,7 +1514,7 @@
    * @return The index of the first occurrence of c in str
    * @deffunc int ap_ind(const char *str, char c)
    */
  -API_EXPORT(int) ap_ind(const char *str, char c);	/* Sigh... */
  +AP_DECLARE(int) ap_ind(const char *str, char c);	/* Sigh... */
   
   /**
    * Search a string from right to left for the first occurrence of a 
  @@ -1524,7 +1524,7 @@
    * @return The index of the first occurrence of c in str
    * @deffunc int ap_rind(const char *str, char c)
    */
  -API_EXPORT(int) ap_rind(const char *str, char c);
  +AP_DECLARE(int) ap_rind(const char *str, char c);
   
   /**
    * Given a string, replace any bare " with \" .
  @@ -1533,7 +1533,7 @@
    * @return A copy of the string with escaped quotes 
    * @deffunc char * ap_escape_quotes(apr_pool_t *p, const char *instring) 
    */
  -API_EXPORT(char *) ap_escape_quotes(apr_pool_t *p, const char *instring);
  +AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring);
   
   /* Misc system hackery */
   /**
  @@ -1542,40 +1542,40 @@
    * @return The user id corresponding to a name
    * @deffunc uid_t ap_uname2id(const char *name) 
    */
  -API_EXPORT(uid_t) ap_uname2id(const char *name);
  +AP_DECLARE(uid_t) ap_uname2id(const char *name);
   /**
    * Convert a group name to a numeric ID
    * @param name The name to convert
    * @return The group id corresponding to a name
    * @deffunc gid_t ap_gname2id(const char *name) 
    */
  -API_EXPORT(gid_t) ap_gname2id(const char *name);
  +AP_DECLARE(gid_t) ap_gname2id(const char *name);
   /**
    * Given the name of an object in the file system determine if it is a directory
    * @param name The name of the object to check
    * @return 1 if it is a directory, 0 otherwise
    * @deffunc int ap_is_rdirectory(const char *name)
    */
  -API_EXPORT(int) ap_is_rdirectory(const char *name);
  +AP_DECLARE(int) ap_is_rdirectory(const char *name);
   /**
    * Given the name of an object in the file system determine if it is a directory - this version is symlink aware
    * @param name The name of the object to check
    * @return 1 if it is a directory, 0 otherwise
    * @deffunc int ap_is_directory(const char *name)
    */
  -API_EXPORT(int) ap_is_directory(const char *name);
  +AP_DECLARE(int) ap_is_directory(const char *name);
   /**
    * Given a pathname in file, extract the directory and chdir to that directory
    * @param file The file who's directory we wish to switch to
    * @deffunc void ap_chdir_file(const char *file)
    */
  -API_EXPORT(void) ap_chdir_file(const char *file);
  +AP_DECLARE(void) ap_chdir_file(const char *file);
   /**
    * Get the maximum number of daemons processes for this version of Apache
    * @return The maximum number of daemon processes
    * @deffunc int ap_get_max_daemons(void)
    */
  -API_EXPORT(int) ap_get_max_daemons(void);
  +AP_DECLARE(int) ap_get_max_daemons(void);
   
   #ifdef _OSD_POSIX
   extern const char *os_set_account(apr_pool_t *p, const char *account);
  @@ -1614,7 +1614,7 @@
    * @param nLine The line the assertion is defined on
    * @deffunc void ap_log_assert(const char *szExp, const char *szFile, int nLine)
    */
  -API_EXPORT(void) ap_log_assert(const char *szExp, const char *szFile, int nLine)
  +AP_DECLARE(void) ap_log_assert(const char *szExp, const char *szFile, int nLine)
   			    __attribute__((noreturn));
   #define ap_assert(exp) ((exp) ? (void)0 : ap_log_assert(#exp,__FILE__,__LINE__))
   
  @@ -1644,7 +1644,7 @@
   #define RAISE_SIGSTOP(x)
   #endif
   
  -API_EXPORT(extern const char *) ap_psignature(const char *prefix, request_rec *r);
  +AP_DECLARE(extern const char *) ap_psignature(const char *prefix, request_rec *r);
   
   /* strtoul does not exist on sunos4. */
   #ifdef strtoul
  
  
  
  1.8       +6 -6      apache-2.0/src/include/mpm_status.h
  
  Index: mpm_status.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/mpm_status.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mpm_status.h	2000/08/06 03:58:03	1.7
  +++ mpm_status.h	2000/10/16 06:04:34	1.8
  @@ -86,7 +86,7 @@
    *            for the connection.
    * @deffunc const char *ap_get_connection_status(long conn_id, const char *key)
    */
  -API_EXPORT(const char *) ap_get_connection_status(long conn_id, const char *key);
  +AP_DECLARE(const char *) ap_get_connection_status(long conn_id, const char *key);
   
   /**
    * Get an array of current connection IDs.
  @@ -94,7 +94,7 @@
    * @return An array of all the current connection IDs
    * @deffunc apr_array_header_t *ap_get_connections(apr_pool_t *p)
    */
  -API_EXPORT(apr_array_header_t *) ap_get_connections(apr_pool_t *p);
  +AP_DECLARE(apr_array_header_t *) ap_get_connections(apr_pool_t *p);
   
   /**
    * Get an array of keys from a given connection.
  @@ -103,7 +103,7 @@
    * @return an array of keys from a given connection
    * @deffunc apr_array_header_t *ap_get_connection_keys(apr_pool_t *p, long conn_id)
    */
  -API_EXPORT(apr_array_header_t *) ap_get_connection_keys(apr_pool_t *p,
  +AP_DECLARE(apr_array_header_t *) ap_get_connection_keys(apr_pool_t *p,
                                                          long conn_id);
   
   /**
  @@ -114,7 +114,7 @@
    * @param value value to set for the key
    * @deffunc void ap_update_connection_status(long conn_id, const char *key, const char *value)
    */
  -API_EXPORT(void) ap_update_connection_status(long conn_id, const char *key, const char *value);
  +AP_DECLARE(void) ap_update_connection_status(long conn_id, const char *key, const char *value);
   
   /**
    * Clear out this connection's status values. Normally called when a
  @@ -122,7 +122,7 @@
    * @param conn_id The connection ID to clear
    * @deffunc void ap_reset_connection_status(long conn_id)
    */
  -API_EXPORT(void) ap_reset_connection_status(long conn_id);
  +AP_DECLARE(void) ap_reset_connection_status(long conn_id);
   
   /**
    * Returns the most up-to-date status table available, in the form of an array
  @@ -131,7 +131,7 @@
    * @return The table of statuses for all connections
    * @deffunc apr_array_header_t *ap_get_status_table(apr_pool_t *p)
    */
  -API_EXPORT(apr_array_header_t *) ap_get_status_table(apr_pool_t *p);
  +AP_DECLARE(apr_array_header_t *) ap_get_status_table(apr_pool_t *p);
   
   #endif /* APACHE_SERVER_STATS_H */
   
  
  
  
  1.5       +1 -1      apache-2.0/src/include/util_charset.h
  
  Index: util_charset.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_charset.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- util_charset.h	2000/08/06 05:17:52	1.4
  +++ util_charset.h	2000/10/16 06:04:35	1.5
  @@ -124,7 +124,7 @@
    * @param The translation handle to use for the actual work
    * @deffunc apr_status_t ap_set_content_xlate(request_rec *r, int output, apr_xlate_t *xlate)
    */
  -API_EXPORT(apr_status_t) ap_set_content_xlate(request_rec *r, int output,
  +AP_DECLARE(apr_status_t) ap_set_content_xlate(request_rec *r, int output,
                                                apr_xlate_t *xlate);
   
   #ifdef __cplusplus
  
  
  
  1.15      +2 -2      apache-2.0/src/include/util_date.h
  
  Index: util_date.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- util_date.h	2000/08/06 15:34:03	1.14
  +++ util_date.h	2000/10/16 06:04:35	1.15
  @@ -91,7 +91,7 @@
    * @return 1 if the string matches, 0 otherwise
    * @deffunc int ap_checkmask(const char *data, const char *mask)
    */
  -API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
  +AP_DECLARE(int) ap_checkmask(const char *data, const char *mask);
   
   /**
    * Parses an HTTP date in one of three standard forms:
  @@ -105,7 +105,7 @@
    *         0 if this would be out of range or if the date is invalid.
    * @deffunc apr_time_t ap_parseHTTPdate(const char *date)
    */
  -API_EXPORT(apr_time_t) ap_parseHTTPdate(const char *date);
  +AP_DECLARE(apr_time_t) ap_parseHTTPdate(const char *date);
   
   #ifdef __cplusplus
   }
  
  
  
  1.27      +7 -7      apache-2.0/src/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_filter.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- util_filter.h	2000/10/13 00:02:06	1.26
  +++ util_filter.h	2000/10/16 06:04:35	1.27
  @@ -255,7 +255,7 @@
    * @return apr_status_t value
    * @deffunc apr_status_t ap_get_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket, apr_ssize_t length)
    */
  -API_EXPORT(apr_status_t) ap_get_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket, apr_ssize_t length);
  +AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket, apr_ssize_t length);
   
   /**
    * Pass the current bucket brigade down to the next filter on the filter
  @@ -266,7 +266,7 @@
    * @return apr_status_t value
    * @deffunc apr_status_t ap_pass_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket)
    */
  -API_EXPORT(apr_status_t) ap_pass_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket);
  +AP_DECLARE(apr_status_t) ap_pass_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket);
   
   /*
    * ap_register_input_filter():
  @@ -286,7 +286,7 @@
    * @param The type of filter function, either AP_FTYPE_CONTENT or AP_FTYPE_CONNECTION
    * @deffunc void ap_register_input_filter(const char *name, ap_in_filter_func filter_func, ap_filter_type ftype)
    */
  -API_EXPORT(void) ap_register_input_filter(const char *name,
  +AP_DECLARE(void) ap_register_input_filter(const char *name,
                                             ap_in_filter_func filter_func,
                                             ap_filter_type ftype);
   /*
  @@ -307,7 +307,7 @@
    * @param The type of filter function, either AP_FTYPE_CONTENT or AP_FTYPE_CONNECTION
    * @deffunc void ap_register_output_filter(const char *name, ap_out_filter_func filter_func, ap_filter_type ftype)
    */
  -API_EXPORT(void) ap_register_output_filter(const char *name,
  +AP_DECLARE(void) ap_register_output_filter(const char *name,
                                              ap_out_filter_func filter_func,
                                              ap_filter_type ftype);
   
  @@ -334,7 +334,7 @@
    * @param c The connection to add the fillter for
    * @deffunc void ap_add_input_filter(const char *name, void *ctx, request_rec *r, conn_rec *c)
    */
  -API_EXPORT(void) ap_add_input_filter(const char *name, void *ctx, request_rec *r, conn_rec *c);
  +AP_DECLARE(void) ap_add_input_filter(const char *name, void *ctx, request_rec *r, conn_rec *c);
   
   /**
    * Add a filter to the current request.  Filters are added in a FIFO manner.
  @@ -345,7 +345,7 @@
    * @param c The connection to add this filter for
    * @deffunc void ap_add_output_filter(const char *name, void *ctx, request_rec *r, conn_rec *c)
    */
  -API_EXPORT(void) ap_add_output_filter(const char *name, void *ctx, 
  +AP_DECLARE(void) ap_add_output_filter(const char *name, void *ctx, 
                                         request_rec *r, conn_rec *c);
   
   /* The next two filters are for abstraction purposes only.  They could be
  @@ -371,7 +371,7 @@
    *          on return
    * @deffunc void ap_save_brigade(ap_filter_t *f, ap_bucket_brigade **save_to, ap_bucket_brigade **b)
    */
  -API_EXPORT(void) ap_save_brigade(ap_filter_t *f, ap_bucket_brigade **save_to,
  +AP_DECLARE(void) ap_save_brigade(ap_filter_t *f, ap_bucket_brigade **save_to,
                                           ap_bucket_brigade **b);    
   
   #ifdef __cplusplus
  
  
  
  1.16      +5 -5      apache-2.0/src/include/util_md5.h
  
  Index: util_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_md5.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- util_md5.h	2000/08/08 05:57:13	1.15
  +++ util_md5.h	2000/10/16 06:04:35	1.16
  @@ -76,7 +76,7 @@
    * @return The checksum
    * @deffunc char *ap_md5(apr_pool_t *a, const unsigned char *string)
    */
  -API_EXPORT(char *) ap_md5(apr_pool_t *a, const unsigned char *string);
  +AP_DECLARE(char *) ap_md5(apr_pool_t *a, const unsigned char *string);
   
   /**
    * Create an MD5 checksum of a string of binary data
  @@ -86,7 +86,7 @@
    * @return The checksum
    * @deffunc char *ap_md5_binary(apr_pool_t *a, const unsigned char *buf, int len)
    */
  -API_EXPORT(char *) ap_md5_binary(apr_pool_t *a, const unsigned char *buf, int len);
  +AP_DECLARE(char *) ap_md5_binary(apr_pool_t *a, const unsigned char *buf, int len);
   
   /**
    * Convert an MD5 checksum into a base64 encoding
  @@ -95,7 +95,7 @@
    * @return The converted encoding
    * @deffunc char *ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context)
    */
  -API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context);
  +AP_DECLARE(char *) ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context);
   
   #ifdef APACHE_XLATE
   /**
  @@ -106,10 +106,10 @@
    * @warning The xlate parameter is only available if APACHE_XLATE is defined
    * @deffunc char *ap_md5digest(apr_pool_t *p, apr_file_t *infile, apr_xlate_t *xlate)
    */
  -API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
  +AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
                                   apr_xlate_t *xlate);
   #else
  -API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile);
  +AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile);
   #endif
   
   #ifdef __cplusplus
  
  
  
  1.13      +8 -8      apache-2.0/src/include/util_script.h
  
  Index: util_script.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_script.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- util_script.h	2000/10/12 04:20:36	1.12
  +++ util_script.h	2000/10/16 06:04:35	1.13
  @@ -83,7 +83,7 @@
    *         use with an exec call.
    * @deffunc char **ap_create_environment(apr_pool_t *p, apr_table_t *t)
    */
  -API_EXPORT(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t);
  +AP_DECLARE(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t);
   
   /**
    * This "cute" little function comes about because the path info on
  @@ -94,7 +94,7 @@
    * @return The length of the path info
    * @deffunc int ap_fine_path_info(const char *uri, const char *path_info)
    */
  -API_EXPORT(int) ap_find_path_info(const char *uri, const char *path_info);
  +AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info);
   
   /**
    * Add CGI environment variables required by HTTP/1.1 to the request's 
  @@ -102,14 +102,14 @@
    * @param r the current request
    * @deffunc void ap_add_cgi_vars(request_rec *r)
    */
  -API_EXPORT(void) ap_add_cgi_vars(request_rec *r);
  +AP_DECLARE(void) ap_add_cgi_vars(request_rec *r);
   
   /**
    * Add common CGI environment variables to the requests environment table
    * @param r The current request
    * @deffunc void ap_add_common_vars(request_rec *r)
    */
  -API_EXPORT(void) ap_add_common_vars(request_rec *r);
  +AP_DECLARE(void) ap_add_common_vars(request_rec *r);
   
   /**
    * Read headers output from a script, ensuring that the output is valid.  If
  @@ -122,7 +122,7 @@
    * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
    * @deffunc int ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer)
    */ 
  -API_EXPORT(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer);
  +AP_DECLARE(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer);
   
   /**
    * Read headers strings from a script, ensuring that the output is valid.  If
  @@ -138,7 +138,7 @@
    * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
    * @deffunc int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
    */ 
  -API_EXPORT_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r, 
  +AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r, 
                                                         char *buffer, 
                                                         const char **termch,
                                                         int *termarg, ...);
  @@ -156,7 +156,7 @@
    * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
    * @deffunc int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
    */ 
  -API_EXPORT(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
  +AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
   				       int (*getsfunc) (char *, int, void *),
   				       void *getsfunc_data);
   
  @@ -169,7 +169,7 @@
    * @param r The currnt request
    * @deffunc void ap_send_size(apr_ssize_t size, request_rec *r)
    */
  -API_EXPORT(void) ap_send_size(apr_ssize_t size, request_rec *r);
  +AP_DECLARE(void) ap_send_size(apr_ssize_t size, request_rec *r);
   
   #ifdef __cplusplus
   }
  
  
  
  1.11      +8 -8      apache-2.0/src/include/util_uri.h
  
  Index: util_uri.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_uri.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- util_uri.h	2000/08/08 11:58:23	1.10
  +++ util_uri.h	2000/10/16 06:04:35	1.11
  @@ -147,7 +147,7 @@
    * @return The default port for this scheme
    * @deffunc unsigned short ap_default_port_for_scheme(const char *scheme_str)
    */ 
  -API_EXPORT(unsigned short) ap_default_port_for_scheme(const char *scheme_str);
  +AP_DECLARE(unsigned short) ap_default_port_for_scheme(const char *scheme_str);
   
   /**
    * Return the default for the current request
  @@ -155,7 +155,7 @@
    * @return The default port
    * @deffunc unsigned short ap_default_port_for_request(const request_rec *r)
    */
  -API_EXPORT(unsigned short) ap_default_port_for_request(const request_rec *r);
  +AP_DECLARE(unsigned short) ap_default_port_for_request(const request_rec *r);
   
   /**
    * Create a copy of a "struct hostent" record; it was presumably returned
  @@ -165,7 +165,7 @@
    * @param hp hostent to duplicate
    * @deffunc struct hostent * ap_pduphostent(apr_pool_t *p, const struct hostent *hp)
    */ 
  -API_EXPORT(struct hostent *) ap_pduphostent(apr_pool_t *p, const struct hostent *hp);
  +AP_DECLARE(struct hostent *) ap_pduphostent(apr_pool_t *p, const struct hostent *hp);
   
   /**
    * resolve hostname, if successful return an ALLOCATED COPY OF the hostent 
  @@ -175,7 +175,7 @@
    * @return The allocated hostent structure
    * @deffunc struct hostent * ap_pgethostbyname(apr_pool_t *p, const char *hostname)
    */
  -API_EXPORT(struct hostent *) ap_pgethostbyname(apr_pool_t *p, const char *hostname);
  +AP_DECLARE(struct hostent *) ap_pgethostbyname(apr_pool_t *p, const char *hostname);
   
   /**
    * Unparse a uri_components structure to an URI string.  Optionally suppress 
  @@ -195,7 +195,7 @@
    * @return The uri as a string
    * @deffunc char * ap_unparse_uri_components(apr_pool_t *p, const uri_components *uptr, unsigned flags)
    */
  -API_EXPORT(char *) ap_unparse_uri_components(apr_pool_t *p, const uri_components *uptr,
  +AP_DECLARE(char *) ap_unparse_uri_components(apr_pool_t *p, const uri_components *uptr,
       unsigned flags);
   
   /**
  @@ -208,7 +208,7 @@
    * @return An HTTP status code
    * @deffunc int ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr)
    */
  -API_EXPORT(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr);
  +AP_DECLARE(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr);
   
   /**
    * Special case for CONNECT parsing: it comes with the hostinfo part only
  @@ -218,13 +218,13 @@
    * @return An HTTP status code
    * @deffunc int ap_parse_hostinfo_components(apr_pool_t *p, const char *hostinfo, uri_components *uptr)
    */
  -API_EXPORT(int) ap_parse_hostinfo_components(apr_pool_t *p, const char *hostinfo, uri_components *uptr);
  +AP_DECLARE(int) ap_parse_hostinfo_components(apr_pool_t *p, const char *hostinfo, uri_components *uptr);
   
   /**
    * Setup everything necessary to parse uri's
    * @deffunc void ap_util_uri_init(void)
    */
  -API_EXPORT(void) ap_util_uri_init(void);
  +AP_DECLARE(void) ap_util_uri_init(void);
   
   #ifdef __cplusplus
   }
  
  
  
  1.5       +7 -7      apache-2.0/src/include/util_xml.h
  
  Index: util_xml.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_xml.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- util_xml.h	2000/08/08 05:57:14	1.4
  +++ util_xml.h	2000/10/16 06:04:35	1.5
  @@ -99,7 +99,7 @@
    * @param text The new text to append
    * @deffunc void ap_text_append(apr_pool_t *p, ap_text_header *hdr, const char *text)
    */
  -API_EXPORT(void) ap_text_append(apr_pool_t *p, ap_text_header *hdr,
  +AP_DECLARE(void) ap_text_append(apr_pool_t *p, ap_text_header *hdr,
                                   const char *text);
   
   
  @@ -239,7 +239,7 @@
    * @return HTTP status code
    * @deffunc int ap_xml_parse_input(request_rec *r, ap_xml_doc **pdoc)
    */
  -API_EXPORT(int) ap_xml_parse_input(request_rec *r, ap_xml_doc **pdoc);
  +AP_DECLARE(int) ap_xml_parse_input(request_rec *r, ap_xml_doc **pdoc);
   
   
   /**
  @@ -259,7 +259,7 @@
    * @param psize Size of the converted text
    * @deffunc void ap_xml_to_text(apr_pool_t *p, const ap_xml_elem *elem, int style, apr_array_header_t *namespaces, int *ns_map, const char **pbuf, size_t *psize);
    */
  -API_EXPORT(void) ap_xml_to_text(apr_pool_t *p, const ap_xml_elem *elem,
  +AP_DECLARE(void) ap_xml_to_text(apr_pool_t *p, const ap_xml_elem *elem,
   				int style, apr_array_header_t *namespaces,
   				int *ns_map, const char **pbuf, size_t *psize);
   
  @@ -276,7 +276,7 @@
    * @return the string that was stored in the XML element
    * @deffunc const char *ap_xml_empty_elem(apr_pool_t *p, const ap_xml_elem *elem)
    */
  -API_EXPORT(const char *) ap_xml_empty_elem(apr_pool_t *p,
  +AP_DECLARE(const char *) ap_xml_empty_elem(apr_pool_t *p,
                                              const ap_xml_elem *elem);
   
   /**
  @@ -288,7 +288,7 @@
    * @return The quoted string
    * @deffunc const char *ap_xml_quote_string(apr_pool_t *p, const char *s, int quotes)
    */
  -API_EXPORT(const char *) ap_xml_quote_string(apr_pool_t *p, const char *s,
  +AP_DECLARE(const char *) ap_xml_quote_string(apr_pool_t *p, const char *s,
                                                int quotes);
   
   /**
  @@ -297,7 +297,7 @@
    * @param elem The element to quote
    * @deffunc void ap_xml_quote_elem(apr_pool_t *p, ap_xml_elem *elem)
    */
  -API_EXPORT(void) ap_xml_quote_elem(apr_pool_t *p, ap_xml_elem *elem);
  +AP_DECLARE(void) ap_xml_quote_elem(apr_pool_t *p, ap_xml_elem *elem);
   
   /* manage an array of unique URIs: ap_xml_insert_uri() and AP_XML_URI_ITEM() */
   
  @@ -308,7 +308,7 @@
    * @return int The uri's index
    * @deffunc int ap_xml_insert_uri(apr_array_header_t *uri_array, const char *uri)
    */
  -API_EXPORT(int) ap_xml_insert_uri(apr_array_header_t *uri_array,
  +AP_DECLARE(int) ap_xml_insert_uri(apr_array_header_t *uri_array,
                                     const char *uri);
   #define AP_XML_GET_URI_ITEM(ary, i)    (((const char * const *)(ary)->elts)[i])
   
  
  
  
  1.15      +1 -1      apache-2.0/src/lib/apr/APRDesign
  
  Index: APRDesign
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/APRDesign,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- APRDesign	2000/07/28 20:21:13	1.14
  +++ APRDesign	2000/10/16 06:04:38	1.15
  @@ -179,7 +179,7 @@
   yet, and it can not parse prototypes that are in any form other than
   	return_type program_name(type1 param1, type2 param2, ...)
   This means that any function prototype that resembles:
  -	APR_EXPORT(ap_status_t) ap_foo(int f1, char *f2)
  +	APR_DECLARE(ap_status_t) ap_foo(int f1, char *f2)
   will need the deffunc.
   
   For an actual example, look at any file in the include directory (ap_tables.h
  
  
  
  1.31      +1 -1      apache-2.0/src/lib/apr/file_io/os2/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- readwrite.c	2000/08/06 06:07:02	1.30
  +++ readwrite.c	2000/10/16 06:04:39	1.31
  @@ -325,7 +325,7 @@
   
   
   
  -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
  +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  
  
  
  1.60      +1 -1      apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- readwrite.c	2000/09/12 23:15:36	1.59
  +++ readwrite.c	2000/10/16 06:04:40	1.60
  @@ -376,7 +376,7 @@
       return rv;
   }
   
  -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
  +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
   {
       apr_status_t cc;
       va_list ap;
  
  
  
  1.31      +1 -1      apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- fileio.h	2000/08/09 14:46:34	1.30
  +++ fileio.h	2000/10/16 06:04:40	1.31
  @@ -144,7 +144,7 @@
   apr_status_t file_cleanup(void *);
   /*mode_t get_fileperms(apr_fileperms_t);
   */
  -APR_EXPORT(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, 
  +APR_DECLARE(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, 
                                                 const char *szFile);
   char * canonical_filename(struct apr_pool_t *pCont, const char *szFile);
   
  
  
  
  1.47      +1 -1      apache-2.0/src/lib/apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- readwrite.c	2000/10/06 17:24:38	1.46
  +++ readwrite.c	2000/10/16 06:04:40	1.47
  @@ -388,7 +388,7 @@
       return -1;
   }
   
  -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
  +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/helpers/MakeEtags
  
  Index: MakeEtags
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/helpers/MakeEtags,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MakeEtags	1999/08/24 05:50:35	1.1
  +++ MakeEtags	2000/10/16 06:04:41	1.2
  @@ -27,7 +27,7 @@
   # Exuberant etags is necessary since it can ignore some defined symbols
   # that obscure the function signatures.
   
  -ignore=API_EXPORT,API_EXPORT_NONSTD,__declspec
  +ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec
   
   # Create an etags file at the root of the source
   # tree, then create symbol links to it from each
  
  
  
  1.45      +0 -7      apache-2.0/src/lib/apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- apr.h.in	2000/10/12 06:14:31	1.44
  +++ apr.h.in	2000/10/16 06:04:42	1.45
  @@ -160,13 +160,6 @@
    */
   #define APR_DECLARE_DATA
   
  -/* These need to move into apr_compat.h when the symbol rename is complete 
  - */
  -#define APR_EXPORT(t)         APR_DECLARE(t)
  -#define APR_EXPORT_NONSTD(t)  APR_DECLARE_NONSTD(t)
  -#define APR_VAR_EXPORT        APR_DECLARE_DATA
  -#define APR_VAR_IMPORT        APR_DECLARE_DATA
  -
   /* Define APR_SSIZE_T_FMT.  
    * If ssize_t is an integer we define it to be "d",
    * if ssize_t is a long int we define it to be "ld",
  
  
  
  1.30      +0 -8      apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- apr.hw	2000/10/16 03:34:20	1.29
  +++ apr.hw	2000/10/16 06:04:42	1.30
  @@ -231,14 +231,6 @@
   #define APR_DECLARE_DATA             __declspec(dllimport)
   #endif
   
  -/* These need to move into apr_compat.h when the symbol rename is complete 
  - */
  -#define APR_EXPORT(t)         APR_DECLARE(t)
  -#define APR_EXPORT_NONSTD(t)  APR_DECLARE_NONSTD(t)
  -#define APR_VAR_EXPORT        APR_DECLARE_DATA
  -#define APR_VAR_IMPORT        APR_DECLARE_DATA
  -
  -
   #define apr_signal(a,b) signal(a,b)
   
   typedef int apr_wait_t;
  
  
  
  1.66      +1 -1      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- apr_file_io.h	2000/08/06 06:07:08	1.65
  +++ apr_file_io.h	2000/10/16 06:04:42	1.66
  @@ -546,7 +546,7 @@
    * @return The number of bytes written
    * @deffunc int apr_fprintf(apr_file_t *fptr, const char *format, ...)
    */ 
  -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
  +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
           __attribute__((format(printf,2,3)));
   
   #ifdef __cplusplus
  
  
  
  1.12      +2 -2      apache-2.0/src/lib/apr/include/apr_fnmatch.h
  
  Index: apr_fnmatch.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_fnmatch.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_fnmatch.h	2000/08/02 05:26:03	1.11
  +++ apr_fnmatch.h	2000/10/16 06:04:42	1.12
  @@ -69,7 +69,7 @@
    * @deffunc apr_status_t apr_fnmatch(const char *pattern, const char *strings, int flags)
    */
   
  -APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *strings,
  +APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, const char *strings,
   			    int flags);
   
   /**
  @@ -78,7 +78,7 @@
    * @return non-zero if pattern has any glob characters in it
    * @deffunc int apr_is_fnmatch(const char *pattern)
    */
  -APR_EXPORT(int) apr_is_fnmatch(const char *pattern);
  +APR_DECLARE(int) apr_is_fnmatch(const char *pattern);
   
   #ifdef __cplusplus
   }
  
  
  
  1.21      +2 -2      apache-2.0/src/lib/apr/include/apr_getopt.h
  
  Index: apr_getopt.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_getopt.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apr_getopt.h	2000/10/09 14:07:54	1.20
  +++ apr_getopt.h	2000/10/16 06:04:42	1.21
  @@ -91,7 +91,7 @@
    * @tip Arguments 2 and 3 are most commonly argc and argv from main(argc, argv)
    * @deffunc apr_status_t apr_initopt(apr_getopt_t **os, apr_pool_t *cont,int argc, char *const *argv)
    */
  -APR_EXPORT(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont,
  +APR_DECLARE(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont,
                                        int argc, char *const *argv);
   
   /**
  @@ -111,7 +111,7 @@
    * </PRE>
    * @deffunc apr_status_t apr_getopt(apr_getopt_t *os, const char *opts, char *optch, const char **optarg)
    */
  -APR_EXPORT(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, 
  +APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, 
                                       char *optch, const char **optarg);
   
   #endif  /* ! APR_GETOPT_H */
  
  
  
  1.13      +6 -6      apache-2.0/src/lib/apr/include/apr_hash.h
  
  Index: apr_hash.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_hash.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_hash.h	2000/10/16 02:58:13	1.12
  +++ apr_hash.h	2000/10/16 06:04:43	1.13
  @@ -95,7 +95,7 @@
    * @return The hash table just created
    * @deffunc apr_hash_t *apr_make_hash(apr_pool_t *pool)
    */
  -APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool);
  +APR_DECLARE(apr_hash_t *) apr_make_hash(apr_pool_t *pool);
   
   /**
    * Associate a value with a key in a hash table.
  @@ -106,7 +106,7 @@
    * @tip If the value is NULL the hash entry is deleted.
    * @deffunc void apr_hash_set(apr_hash_t *ht, const void *key, apr_size_t klen, const void *val)
    */
  -APR_EXPORT(void) apr_hash_set(apr_hash_t *ht, const void *key,
  +APR_DECLARE(void) apr_hash_set(apr_hash_t *ht, const void *key,
                                 apr_ssize_t klen, const void *val);
   
   /**
  @@ -117,7 +117,7 @@
    * @return Returns NULL if the key is not present.
    * @deffunc void *apr_hash_get(apr_hash_t *ht, const void *key, apr_size_t klen)
    */
  -APR_EXPORT(void*) apr_hash_get(apr_hash_t *ht, const void *key,
  +APR_DECLARE(void*) apr_hash_get(apr_hash_t *ht, const void *key,
                                  apr_ssize_t klen);
   
   /**
  @@ -146,7 +146,7 @@
    * </PRE>
    * @deffunc apr_hash_index_t * apr_hash_first(apr_hash_t *ht)
    */
  -APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht);
  +APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht);
   
   /**
    * Continue iterating over the entries in a hash table.
  @@ -154,7 +154,7 @@
    * @return a pointer to the updated iteration state.  NULL if there are no more  *         entries.
    * @deffunc apr_hash_index_t * apr_hash_next(apr_hash_index_t *hi)
    */
  -APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi);
  +APR_DECLARE(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi);
   
   /**
    * Get the current entry's details from the iteration state.
  @@ -166,7 +166,7 @@
    *      corresponding data, or they may be NULL if the data isn't interesting.
    * @deffunc void apr_hash_this(apr_hash_index_t *hi, const void **key, apr_size_t *klen, void **val);
    */
  -APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi, const void **key, 
  +APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, const void **key, 
                                  apr_size_t *klen, void **val);
   
   #ifdef __cplusplus
  
  
  
  1.43      +7 -7      apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- apr_lib.h	2000/08/06 06:07:08	1.42
  +++ apr_lib.h	2000/10/16 06:04:43	1.43
  @@ -107,7 +107,7 @@
    * </PRE>
    * @deffunc const char * apr_filename_of_pathname(const char *pathname)
    */
  -APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname);
  +APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname);
   
   /* These macros allow correct support of 8-bit characters on systems which
    * support 8-bit characters.  Pretty dumb how the cast is required, but
  @@ -202,7 +202,7 @@
    * </PRE>
    * @deffunc int apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b), apr_vformatter_buff_t *c, const char *fmt, va_list ap)
    */
  -APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b),
  +APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b),
   			       apr_vformatter_buff_t *c, const char *fmt,
   			       va_list ap);
   
  @@ -212,7 +212,7 @@
    * @param hash The password to validate against
    * @deffunc apr_status_t apr_validate_password(const char *passwd, const char *hash)
    */
  -APR_EXPORT(apr_status_t) apr_validate_password(const char *passwd, const char *hash);
  +APR_DECLARE(apr_status_t) apr_validate_password(const char *passwd, const char *hash);
   
   
   /*
  @@ -241,7 +241,7 @@
    * @param ... The arguments to use to fill out the format string.
    * @deffunc int apr_snprintf(char *buf, size_t len, const char *format, ...)
    */
  -APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, 
  +APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, size_t len, 
                                      const char *format, ...)
   	__attribute__((format(printf,3,4)));
   
  @@ -254,7 +254,7 @@
    * @param ap The arguments to use to fill out the format string.
    * @deffunc int apr_vsnprintf(char *buf, size_t len, const char *format, va_list ap)
    */
  -APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format,
  +APR_DECLARE(int) apr_vsnprintf(char *buf, size_t len, const char *format,
   			      va_list ap);
   
   /**
  @@ -264,7 +264,7 @@
    * @param bufsize The length of the password string.
    * @deffunc apr_status_t apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize)
    */
  -APR_EXPORT(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
  +APR_DECLARE(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
   
   /**
    * Register a process to be killed when a pool dies.
  @@ -280,7 +280,7 @@
    * </PRE>
    * @deffunc void apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid, enum kill_conditions how)
    */
  -APR_EXPORT(void) apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid,
  +APR_DECLARE(void) apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid,
   				     enum kill_conditions how);
   
   #ifdef __cplusplus
  
  
  
  1.18      +5 -5      apache-2.0/src/lib/apr/include/apr_md5.h
  
  Index: apr_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_md5.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- apr_md5.h	2000/08/06 06:07:09	1.17
  +++ apr_md5.h	2000/10/16 06:04:44	1.18
  @@ -121,7 +121,7 @@
    * @param context The MD5 context to initialize.
    * @deffunc apr_status_t apr_MD5Init(apr_md5_ctx_t *context)
    */
  -APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context);
  +APR_DECLARE(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context);
   
   /**
    * MD5 translation setup.  Provides the APR translation handle to be used 
  @@ -131,7 +131,7 @@
    * @deffunc apr_status_t apr_MD5SetXlate(apr_md5_ctx_t *context, apr_xlate_t *xlate)
    */
   #if APR_HAS_XLATE
  -APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, 
  +APR_DECLARE(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, 
                                            apr_xlate_t *xlate);
   #else
   #define apr_MD5SetXlate(context, xlate) APR_ENOTIMPL
  @@ -145,7 +145,7 @@
    * @param inputLen The length of the next message block
    * @deffunc apr_status_t apr_MD5Update(apr_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen)
    */
  -APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context,
  +APR_DECLARE(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context,
                                          const unsigned char *input,
                                          unsigned int inputLen);
   
  @@ -156,7 +156,7 @@
    * @param context The MD5 content we are finalizing.
    * @deffunc apr_status_t apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], apr_md5_ctx_t *context)
    */
  -APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
  +APR_DECLARE(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
                                         apr_md5_ctx_t *context);
   
   /**
  @@ -167,7 +167,7 @@
    * @param nbytes The length of the string
    * @deffunc apr_status_t apr_MD5Encode(const char *password, const char *salt, char *result, size_t nbytes)
    */
  -APR_EXPORT(apr_status_t) apr_MD5Encode(const char *password, const char *salt,
  +APR_DECLARE(apr_status_t) apr_MD5Encode(const char *password, const char *salt,
                                        char *result, size_t nbytes);
   
   #ifdef __cplusplus
  
  
  
  1.31      +16 -16    apache-2.0/src/lib/apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_pools.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- apr_pools.h	2000/08/06 06:07:09	1.30
  +++ apr_pools.h	2000/10/16 06:04:44	1.31
  @@ -162,9 +162,9 @@
   #endif
   #define apr_pool_join(a,b)
   #else
  -APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub);
  -APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts);
  -APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
  +APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub);
  +APR_DECLARE(apr_pool_t *) apr_find_pool(const void *ts);
  +APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
   #endif
   
   #ifdef ULTRIX_BRAIN_DEATH
  @@ -201,7 +201,7 @@
    *      error.
    * @deffunc apr_pool_t *apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode))
    */
  -APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode));
  +APR_DECLARE(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode));
   
   /**
    * clear all memory in the pool
  @@ -210,7 +210,7 @@
    *       to re-use this memory for the next allocation.
    * @deffunc void apr_clear_pool(apr_pool_t *p)
    */
  -APR_EXPORT(void) apr_clear_pool(apr_pool_t *p);
  +APR_DECLARE(void) apr_clear_pool(apr_pool_t *p);
   
   /**
    * destroy the pool
  @@ -218,7 +218,7 @@
    * @tip This will actually free the memory
    * @deffunc void apr_destroy_pool(apr_pool_t *p)
    */
  -APR_EXPORT(void) apr_destroy_pool(apr_pool_t *p);
  +APR_DECLARE(void) apr_destroy_pool(apr_pool_t *p);
   
   /**
    * report the number of bytes currently in the pool
  @@ -226,14 +226,14 @@
    * @return The number of bytes
    * @deffunc apr_size_t apr_bytes_in_pool(apr_pool_t *p)
    */
  -APR_EXPORT(apr_size_t) apr_bytes_in_pool(apr_pool_t *p);
  +APR_DECLARE(apr_size_t) apr_bytes_in_pool(apr_pool_t *p);
   
   /**
    * report the number of bytes currently in the list of free blocks
    * @return The number of bytes
    * @deffunc apr_size_t apr_bytes_in_free_blocks(void)
    */
  -APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void);
  +APR_DECLARE(apr_size_t) apr_bytes_in_free_blocks(void);
   
   /**
    * Determine if pool a is an ancestor of pool b
  @@ -243,7 +243,7 @@
    *         of all pools.
    * @deffunc int apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
    */
  -APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
  +APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
   
   /**
    * Allocate a block of memory from a pool
  @@ -252,7 +252,7 @@
    * @return The allocated memory
    * @deffunc void *apr_palloc(apr_pool_t *c, apr_size_t reqsize)
    */
  -APR_EXPORT(void *) apr_palloc(apr_pool_t *c, apr_size_t reqsize);
  +APR_DECLARE(void *) apr_palloc(apr_pool_t *c, apr_size_t reqsize);
   
   /**
    * Allocate a block of memory from a pool and set all of the memory to 0
  @@ -261,7 +261,7 @@
    * @return The allocated memory
    * @deffunc void *apr_pcalloc(apr_pool_t *p, apr_size_t size)
    */
  -APR_EXPORT(void *) apr_pcalloc(apr_pool_t *p, apr_size_t size);
  +APR_DECLARE(void *) apr_pcalloc(apr_pool_t *p, apr_size_t size);
   
   /**
    * Register a function to be called when a pool is cleared or destroyed
  @@ -272,7 +272,7 @@
    * @param child_cleanup The function to call when a child process is created 
    * @deffunc void apr_register_cleanup(apr_pool_t *p, const void *data, apr_status_t (*plain_cleanup) (void *), apr_status_t (*child_cleanup) (void *))
    */
  -APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data,
  +APR_DECLARE(void) apr_register_cleanup(apr_pool_t *p, const void *data,
                                        apr_status_t (*plain_cleanup) (void *),
                                        apr_status_t (*child_cleanup) (void *));
   
  @@ -283,7 +283,7 @@
    * @param cleanup The function to remove from cleanup
    * @deffunc void apr_kill_cleanup(apr_pool_t *p, const void *data, apr_status_t (*cleanup) (void *))
    */
  -APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data,
  +APR_DECLARE(void) apr_kill_cleanup(apr_pool_t *p, const void *data,
                                    apr_status_t (*cleanup) (void *));
   
   /**
  @@ -293,7 +293,7 @@
    * @param cleanup The function to remove from cleanup
    * @deffunc apr_status_t apr_run_cleanup(apr_pool_t *p, void *data, apr_status_t (*cleanup) (void *))
    */
  -APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data,
  +APR_DECLARE(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data,
                                          apr_status_t (*cleanup) (void *));
   
   /* Preparing for exec() --- close files, etc., but *don't* flush I/O
  @@ -304,14 +304,14 @@
    * closed because we are about to exec a new program
    * @deffunc void apr_cleanup_for_exec(void)
    */
  -APR_EXPORT(void) apr_cleanup_for_exec(void);
  +APR_DECLARE(void) apr_cleanup_for_exec(void);
   
   /**
    * An empty cleanup function 
    * @param data The data to cleanup
    * @deffunc apr_status_t apr_null_cleanup(void *data)
    */
  -APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data);
  +APR_DECLARE_NONSTD(apr_status_t) apr_null_cleanup(void *data);
   
   
   /* used to guarantee to the apr_pool_t debugging code that the sub apr_pool_t will not be
  
  
  
  1.5       +8 -8      apache-2.0/src/lib/apr/include/apr_strings.h
  
  Index: apr_strings.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_strings.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_strings.h	2000/08/02 05:26:07	1.4
  +++ apr_strings.h	2000/10/16 06:04:44	1.5
  @@ -118,7 +118,7 @@
    * @return The new string
    * @deffunc char *apr_pstrdup(apr_pool_t *p, const char *s)
    */
  -APR_EXPORT(char *) apr_pstrdup(apr_pool_t *p, const char *s);
  +APR_DECLARE(char *) apr_pstrdup(apr_pool_t *p, const char *s);
   
   /**
    * duplicate the first n characters ofa string into memory allocated 
  @@ -129,7 +129,7 @@
    * @return The new string
    * @deffunc char *apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n)
    */
  -APR_EXPORT(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n);
  +APR_DECLARE(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n);
   
   /**
    * Concatenate multiple strings, allocating memory out a pool
  @@ -138,7 +138,7 @@
    * @return The new string
    * @deffunc char *apr_pstrcat(apr_pool_t *p, ...)
    */
  -APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...);
  +APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...);
   
   /**
    * printf-style style printing routine.  The data is output to a string 
  @@ -149,7 +149,7 @@
    * @return The new string
    * @deffunc char *apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap)
    */
  -APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap);
  +APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap);
   
   /**
    * printf-style style printing routine.  The data is output to a string 
  @@ -160,7 +160,7 @@
    * @return The new string
    * @deffunc char *apr_psprintf(apr_pool_t *p, const char *fmt, ...)
    */
  -APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...);
  +APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...);
   
   /**
    * copy n characters from src to des>
  @@ -179,7 +179,7 @@
    * </PRE>
    * @deffunc char *apr_cpystrn(char *dst, const char *src, size_t dst_size)
    */
  -APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size);
  +APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size);
   
   /**
    * Strip spaces from a string
  @@ -188,7 +188,7 @@
    * @param src The string to rid the spaces from.
    * @deffunc char *apr_collapse_spaces(char *dest, const char *src)
    */
  -APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src);
  +APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src);
   
   /**
    * Convert the arguments to a program from one string to an array of 
  @@ -198,7 +198,7 @@
    * @param token_context Pool to use.
    * @deffunc apr_status_t apr_tokenize_to_argv(const char *arg_str, char ***argv_out, apr_pool_t *token_context);
    */
  -APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str,
  +APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str,
                                               char ***argv_out,
                                               apr_pool_t *token_context);
   
  
  
  
  1.8       +32 -32    apache-2.0/src/lib/apr/include/apr_tables.h
  
  Index: apr_tables.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_tables.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_tables.h	2000/08/22 21:55:34	1.7
  +++ apr_tables.h	2000/10/16 06:04:44	1.8
  @@ -189,22 +189,22 @@
                                  || (((apr_array_header_t *)(t))->nelts == 0))
   #define apr_is_empty_btable(t) apr_is_empty_table(t)
   
  -APR_EXPORT(apr_array_header_t *) apr_make_array(struct apr_pool_t *p,
  +APR_DECLARE(apr_array_header_t *) apr_make_array(struct apr_pool_t *p,
   						int nelts, int elt_size);
  -APR_EXPORT(void *) apr_push_array(apr_array_header_t *arr);
  -APR_EXPORT(void) apr_array_cat(apr_array_header_t *dst,
  +APR_DECLARE(void *) apr_push_array(apr_array_header_t *arr);
  +APR_DECLARE(void) apr_array_cat(apr_array_header_t *dst,
   			       const apr_array_header_t *src);
   
   /* copy_array copies the *entire* array.  copy_array_hdr just copies
    * the header, and arranges for the elements to be copied if (and only
    * if) the code subsequently does a push or arraycat.
    */
  -APR_EXPORT(apr_array_header_t *) apr_copy_array(struct apr_pool_t *p,
  +APR_DECLARE(apr_array_header_t *) apr_copy_array(struct apr_pool_t *p,
   						const apr_array_header_t *arr);
  -APR_EXPORT(apr_array_header_t *)
  +APR_DECLARE(apr_array_header_t *)
   	apr_copy_array_hdr(struct apr_pool_t *p,
   			   const apr_array_header_t *arr);
  -APR_EXPORT(apr_array_header_t *)
  +APR_DECLARE(apr_array_header_t *)
   	apr_append_arrays(struct apr_pool_t *p,
   			  const apr_array_header_t *first,
   			  const apr_array_header_t *second);
  @@ -215,52 +215,52 @@
    * or if there are no elements in the array.
    * If sep is non-NUL, it will be inserted between elements as a separator.
    */
  -APR_EXPORT(char *) apr_array_pstrcat(struct apr_pool_t *p,
  +APR_DECLARE(char *) apr_array_pstrcat(struct apr_pool_t *p,
   				     const apr_array_header_t *arr,
   				     const char sep);
  -APR_EXPORT(apr_table_t *) apr_make_table(struct apr_pool_t *p, int nelts);
  -APR_EXPORT(apr_btable_t *) apr_make_btable(struct apr_pool_t *p, int nelts);
  -APR_EXPORT(apr_table_t *) apr_copy_table(struct apr_pool_t *p,
  +APR_DECLARE(apr_table_t *) apr_make_table(struct apr_pool_t *p, int nelts);
  +APR_DECLARE(apr_btable_t *) apr_make_btable(struct apr_pool_t *p, int nelts);
  +APR_DECLARE(apr_table_t *) apr_copy_table(struct apr_pool_t *p,
   					 const apr_table_t *t);
  -APR_EXPORT(apr_btable_t *) apr_copy_btable(struct apr_pool_t *p,
  +APR_DECLARE(apr_btable_t *) apr_copy_btable(struct apr_pool_t *p,
   					   const apr_btable_t *t);
  -APR_EXPORT(void) apr_clear_table(apr_table_t *t);
  -APR_EXPORT(void) apr_clear_btable(apr_btable_t *t);
  -APR_EXPORT(const char *) apr_table_get(const apr_table_t *t, const char *key);
  -APR_EXPORT(const apr_item_t *) apr_btable_get(const apr_btable_t *t,
  +APR_DECLARE(void) apr_clear_table(apr_table_t *t);
  +APR_DECLARE(void) apr_clear_btable(apr_btable_t *t);
  +APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *key);
  +APR_DECLARE(const apr_item_t *) apr_btable_get(const apr_btable_t *t,
   					      const char *key);
  -APR_EXPORT(void) apr_table_set(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_set(apr_table_t *t, const char *key,
   			       const char *val);
  -APR_EXPORT(void) apr_btable_set(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_set(apr_btable_t *t, const char *key,
   				size_t size, const void *val);
  -APR_EXPORT(void) apr_table_setn(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_setn(apr_table_t *t, const char *key,
   				const char *val);
  -APR_EXPORT(void) apr_btable_setn(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_setn(apr_btable_t *t, const char *key,
   				 size_t size, const void *val);
  -APR_EXPORT(void) apr_table_unset(apr_table_t *t, const char *key);
  -APR_EXPORT(void) apr_btable_unset(apr_btable_t *t, const char *key);
  -APR_EXPORT(void) apr_table_merge(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_unset(apr_table_t *t, const char *key);
  +APR_DECLARE(void) apr_btable_unset(apr_btable_t *t, const char *key);
  +APR_DECLARE(void) apr_table_merge(apr_table_t *t, const char *key,
   				 const char *val);
  -APR_EXPORT(void) apr_table_mergen(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key,
   				  const char *val);
  -APR_EXPORT(void) apr_table_add(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_add(apr_table_t *t, const char *key,
   			       const char *val);
  -APR_EXPORT(void) apr_btable_add(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_add(apr_btable_t *t, const char *key,
   				size_t size, const void *val);
  -APR_EXPORT(void) apr_table_addn(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_addn(apr_table_t *t, const char *key,
   				const char *val);
  -APR_EXPORT(void) apr_btable_addn(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_addn(apr_btable_t *t, const char *key,
   				 size_t size, const void *val);
  -APR_EXPORT(apr_table_t *) apr_overlay_tables(struct apr_pool_t *p,
  +APR_DECLARE(apr_table_t *) apr_overlay_tables(struct apr_pool_t *p,
   					     const apr_table_t *overlay,
   					     const apr_table_t *base);
  -APR_EXPORT(apr_btable_t *) apr_overlay_btables(struct apr_pool_t *p,
  +APR_DECLARE(apr_btable_t *) apr_overlay_btables(struct apr_pool_t *p,
   					       const apr_btable_t *overlay,
   					       const apr_btable_t *base);
  -APR_EXPORT(void)
  +APR_DECLARE(void)
   	apr_table_do(int (*comp) (void *, const char *, const char *),
   		     void *rec, const apr_table_t *t, ...);
  -APR_EXPORT(void)
  +APR_DECLARE(void)
           apr_table_vdo(int (*comp) (void *, const char *, const char *),
                        void *rec, const apr_table_t *t, va_list);                  
   
  @@ -288,7 +288,7 @@
    */
   #define APR_OVERLAP_TABLES_SET   (0)
   #define APR_OVERLAP_TABLES_MERGE (1)
  -APR_EXPORT(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b,
  +APR_DECLARE(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b,
   				    unsigned flags);
   
   #ifdef __cplusplus
  
  
  
  1.69      +18 -18    apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- apr_pools.c	2000/10/11 17:13:15	1.68
  +++ apr_pools.c	2000/10/16 06:04:46	1.69
  @@ -456,7 +456,7 @@
   #define POOL_HDR_CLICKS (1 + ((sizeof(struct apr_pool_t) - 1) / CLICK_SZ))
   #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
   
  -APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode))
  +APR_DECLARE(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode))
   {
       union block_hdr *blok;
       apr_pool_t *new_pool;
  @@ -537,7 +537,7 @@
       struct cleanup *next;
   };
   
  -APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data,
  +APR_DECLARE(void) apr_register_cleanup(apr_pool_t *p, const void *data,
   				      apr_status_t (*plain_cleanup) (void *),
   				      apr_status_t (*child_cleanup) (void *))
   {
  @@ -553,7 +553,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data,
  +APR_DECLARE(void) apr_kill_cleanup(apr_pool_t *p, const void *data,
                                    apr_status_t (*cleanup) (void *))
   {
       struct cleanup *c;
  @@ -574,7 +574,7 @@
       }
   }
   
  -APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data,
  +APR_DECLARE(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data,
                                          apr_status_t (*cleanup) (void *))
   {
       apr_kill_cleanup(p, data, cleanup);
  @@ -607,7 +607,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_cleanup_for_exec(void)
  +APR_DECLARE(void) apr_cleanup_for_exec(void)
   {
   #if !defined(WIN32) && !defined(OS2)
       /*
  @@ -623,7 +623,7 @@
   #endif /* ndef WIN32 */
   }
   
  -APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data)
  +APR_DECLARE_NONSTD(apr_status_t) apr_null_cleanup(void *data)
   {
       /* do nothing cleanup routine */
       return APR_SUCCESS;
  @@ -676,7 +676,7 @@
    * This way, we are garaunteed that we only lock this mutex once when calling
    * either one of these functions.
    */
  -APR_EXPORT(void) apr_clear_pool(apr_pool_t *a)
  +APR_DECLARE(void) apr_clear_pool(apr_pool_t *a)
   {
       while (a->sub_pools) {
   	apr_destroy_pool(a->sub_pools);
  @@ -711,7 +711,7 @@
   #endif
   }
   
  -APR_EXPORT(void) apr_destroy_pool(apr_pool_t *a)
  +APR_DECLARE(void) apr_destroy_pool(apr_pool_t *a)
   {
       apr_clear_pool(a);
   #if APR_HAS_THREADS
  @@ -735,11 +735,11 @@
       free_blocks(a->first);
   }
   
  -APR_EXPORT(apr_size_t) apr_bytes_in_pool(apr_pool_t *p)
  +APR_DECLARE(apr_size_t) apr_bytes_in_pool(apr_pool_t *p)
   {
       return bytes_in_block_list(p->first);
   }
  -APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void)
  +APR_DECLARE(apr_size_t) apr_bytes_in_free_blocks(void)
   {
       return bytes_in_block_list(block_freelist);
   }
  @@ -762,7 +762,7 @@
   /* Find the pool that ts belongs to, return NULL if it doesn't
    * belong to any pool.
    */
  -APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts)
  +APR_DECLARE(apr_pool_t *) apr_find_pool(const void *ts)
   {
       const char *s = ts;
       union block_hdr **pb;
  @@ -808,7 +808,7 @@
   /* return TRUE iff a is an ancestor of b
    * NULL is considered an ancestor of all pools
    */
  -APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
  +APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
   {
       if (a == NULL) {
   	return 1;
  @@ -830,7 +830,7 @@
    * instead.  This is a guarantee by the caller that sub will not
    * be destroyed before p is.
    */
  -APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub)
  +APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub)
   {
       union block_hdr *b;
   
  @@ -857,7 +857,7 @@
    * Allocating stuff...
    */
   
  -APR_EXPORT(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize)
  +APR_DECLARE(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize)
   {
   #ifdef ALLOC_USE_MALLOC
       apr_size_t size = reqsize + CLICK_SZ;
  @@ -949,7 +949,7 @@
   #endif
   }
   
  -APR_EXPORT(void *) apr_pcalloc(apr_pool_t *a, apr_size_t size)
  +APR_DECLARE(void *) apr_pcalloc(apr_pool_t *a, apr_size_t size)
   {
       void *res = apr_palloc(a, size);
       memset(res, '\0', size);
  @@ -1042,7 +1042,7 @@
   #endif
   }
   
  -APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap)
  +APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap)
   {
   #ifdef ALLOC_USE_MALLOC
       struct psprintf_data ps;
  @@ -1101,7 +1101,7 @@
   #endif
   }
   
  -APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...)
  +APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...)
   {
       va_list ap;
       char *res;
  @@ -1124,7 +1124,7 @@
    * generic interface, but for now, it's a special case
    */
   
  -APR_EXPORT(void) apr_note_subprocess(apr_pool_t *a, apr_proc_t *pid,
  +APR_DECLARE(void) apr_note_subprocess(apr_pool_t *a, apr_proc_t *pid,
                                       enum kill_conditions how)
   {
       struct process_chain *new =
  
  
  
  1.23      +2 -2      apache-2.0/src/lib/apr/misc/unix/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/getopt.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- getopt.c	2000/08/17 00:29:39	1.22
  +++ getopt.c	2000/10/16 06:04:47	1.23
  @@ -35,7 +35,7 @@
   
   #define EMSG    ""
   
  -APR_EXPORT(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont,
  +APR_DECLARE(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont,
                                        int argc, char *const *argv)
   {
       *os = apr_palloc(cont, sizeof(apr_getopt_t));
  @@ -48,7 +48,7 @@
       return APR_SUCCESS;
   }
   
  -APR_EXPORT(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, 
  +APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, 
                                       char *optch, const char **optarg)
   {
       const char *p;
  
  
  
  1.16      +4 -4      apache-2.0/src/lib/apr/misc/unix/otherchild.c
  
  Index: otherchild.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/otherchild.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- otherchild.c	2000/08/02 05:26:22	1.15
  +++ otherchild.c	2000/10/16 06:04:47	1.16
  @@ -71,7 +71,7 @@
   
   static apr_other_child_rec_t *other_children = NULL;
   
  -APR_EXPORT(void) apr_register_other_child(apr_proc_t *pid,
  +APR_DECLARE(void) apr_register_other_child(apr_proc_t *pid,
                        void (*maintenance) (int reason, void *, int status),
                        void *data, apr_file_t *write_fd, apr_pool_t *p)
   {
  @@ -91,7 +91,7 @@
       other_children = ocr;
   }
   
  -APR_EXPORT(void) apr_unregister_other_child(void *data)
  +APR_DECLARE(void) apr_unregister_other_child(void *data)
   {
       apr_other_child_rec_t **pocr, *nocr;
   
  @@ -156,7 +156,7 @@
       }
   }
   
  -APR_EXPORT(apr_status_t) apr_reap_other_child(apr_proc_t *pid, int status)
  +APR_DECLARE(apr_status_t) apr_reap_other_child(apr_proc_t *pid, int status)
   {
       apr_other_child_rec_t *ocr, *nocr;
   
  @@ -172,7 +172,7 @@
       return APR_CHILD_NOTDONE;
   }
   
  -APR_EXPORT(void) apr_check_other_child(void)
  +APR_DECLARE(void) apr_check_other_child(void)
   {
       apr_other_child_rec_t *ocr, *nocr;
       pid_t waitret; 
  
  
  
  1.16      +1 -1      apache-2.0/src/lib/apr/misc/win32/names.c
  
  Index: names.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- names.c	2000/08/06 06:07:18	1.15
  +++ names.c	2000/10/16 06:04:47	1.16
  @@ -82,7 +82,7 @@
    * is present on the existing path.  This routine also
    * converts alias names to long names.
    */
  -APR_EXPORT(char *) apr_os_systemcase_filename(apr_pool_t *pCont, 
  +APR_DECLARE(char *) apr_os_systemcase_filename(apr_pool_t *pCont, 
                                                const char *szFile)
   {
       char buf[HUGE_STRING_LEN];
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/passwd/apr_getpass.c
  
  Index: apr_getpass.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/passwd/apr_getpass.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_getpass.c	2000/08/02 05:26:32	1.2
  +++ apr_getpass.c	2000/10/16 06:04:48	1.3
  @@ -204,7 +204,7 @@
    * but the caller is *not* made aware of it.
    */
   
  -APR_EXPORT(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsiz)
  +APR_DECLARE(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsiz)
   {
       char *pw_got = NULL;
       int result = 0;
  
  
  
  1.4       +7 -7      apache-2.0/src/lib/apr/passwd/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/passwd/apr_md5.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_md5.c	2000/08/06 06:07:25	1.3
  +++ apr_md5.c	2000/10/16 06:04:48	1.4
  @@ -186,7 +186,7 @@
   
   /* MD5 initialization. Begins an MD5 operation, writing a new context.
    */
  -APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context)
  +APR_DECLARE(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context)
   {
       context->count[0] = context->count[1] = 0;
       /* Load magic initialization constants. */
  @@ -205,7 +205,7 @@
    * to be used for translating the content before calculating the
    * digest.
    */
  -APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, 
  +APR_DECLARE(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, 
                                            apr_xlate_t *xlate)
   {
       apr_status_t rv;
  @@ -229,7 +229,7 @@
      operation, processing another message block, and updating the
      context.
    */
  -APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context,
  +APR_DECLARE(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context,
                                        const unsigned char *input,
                                        unsigned int inputLen)
   {
  @@ -311,7 +311,7 @@
   /* MD5 finalization. Ends an MD5 message-digest operation, writing the
      the message digest and zeroizing the context.
    */
  -APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
  +APR_DECLARE(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
                                         apr_md5_ctx_t *context)
   {
       unsigned char bits[8];
  @@ -461,7 +461,7 @@
   }
   
   #ifdef CHARSET_EBCDIC
  -APR_EXPORT(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
  +APR_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
   {
       xlate_ebcdic_to_ascii = xlate;
       return APR_SUCCESS;
  @@ -491,7 +491,7 @@
       }
   }
   
  -APR_EXPORT(apr_status_t) apr_MD5Encode(const char *pw, const char *salt,
  +APR_DECLARE(apr_status_t) apr_MD5Encode(const char *pw, const char *salt,
                                char *result, size_t nbytes)
   {
       /*
  @@ -652,7 +652,7 @@
    * APR_EMISMATCH if they don't.
    */
   
  -APR_EXPORT(apr_status_t) apr_validate_password(const char *passwd, 
  +APR_DECLARE(apr_status_t) apr_validate_password(const char *passwd, 
                                                  const char *hash)
   {
       char sample[120];
  
  
  
  1.4       +4 -4      apache-2.0/src/lib/apr/strings/apr_cpystrn.c
  
  Index: apr_cpystrn.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_cpystrn.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_cpystrn.c	2000/08/06 06:07:25	1.3
  +++ apr_cpystrn.c	2000/10/16 06:04:48	1.4
  @@ -80,7 +80,7 @@
    * apr_cpystrn() follows the same call structure as strncpy().
    */
   
  -APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size)
  +APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size)
   {
   
       char *d, *end;
  @@ -120,7 +120,7 @@
    *                   pool and filled in with copies of the tokens
    *                   found during parsing of the arg_str. 
    */
  -APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str, 
  +APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str, 
                                               char ***argv_out,
                                               apr_pool_t *token_context)
   {
  @@ -212,7 +212,7 @@
    * Corrected Win32 to accept "a/b\\stuff", "a:stuff"
    */
   
  -APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname)
  +APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname)
   {
       const char path_separator = '/';
       const char *s = strrchr(pathname, path_separator);
  @@ -234,7 +234,7 @@
    * collapse in place (src == dest) is legal.
    * returns terminating null ptr to dest string.
    */
  -APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src)
  +APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src)
   {
       while (*src) {
           if (!apr_isspace(*src)) 
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/strings/apr_fnmatch.c
  
  Index: apr_fnmatch.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_fnmatch.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_fnmatch.c	2000/08/06 06:07:26	1.3
  +++ apr_fnmatch.c	2000/10/16 06:04:48	1.4
  @@ -56,7 +56,7 @@
   
   static const char *rangematch(const char *, int, int);
   
  -APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags)
  +APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags)
   {
       const char *stringstart;
       char c, test;
  @@ -210,7 +210,7 @@
   
   /* This function is an Apache addition */
   /* return non-zero if pattern has any glob chars in it */
  -APR_EXPORT(int) apr_is_fnmatch(const char *pattern)
  +APR_DECLARE(int) apr_is_fnmatch(const char *pattern)
   {
       int nesting;
   
  
  
  
  1.6       +3 -3      apache-2.0/src/lib/apr/strings/apr_snprintf.c
  
  Index: apr_snprintf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_snprintf.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_snprintf.c	2000/09/13 20:20:17	1.5
  +++ apr_snprintf.c	2000/10/16 06:04:48	1.6
  @@ -653,7 +653,7 @@
   /*
    * Do format conversion placing the output in buffer
    */
  -APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
  +APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
       apr_vformatter_buff_t *vbuff, const char *fmt, va_list ap)
   {
       register char *sp;
  @@ -1155,7 +1155,7 @@
   }
   
   
  -APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, 
  +APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, size_t len, 
                                      const char *format, ...)
   {
       int cc;
  @@ -1176,7 +1176,7 @@
   }
   
   
  -APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format,
  +APR_DECLARE(int) apr_vsnprintf(char *buf, size_t len, const char *format,
   			     va_list ap)
   {
       int cc;
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/strings/apr_strings.c
  
  Index: apr_strings.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_strings.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_strings.c	2000/08/02 05:26:34	1.2
  +++ apr_strings.c	2000/10/16 06:04:49	1.3
  @@ -57,7 +57,7 @@
   #include "apr_private.h"
   #include "apr_lib.h"
   
  -APR_EXPORT(char *) apr_pstrdup(apr_pool_t *a, const char *s)
  +APR_DECLARE(char *) apr_pstrdup(apr_pool_t *a, const char *s)
   {
       char *res;
       size_t len;
  @@ -71,7 +71,7 @@
       return res;
   }
   
  -APR_EXPORT(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n)
  +APR_DECLARE(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n)
   {
       char *res;
   
  @@ -84,7 +84,7 @@
       return res;
   }
   
  -APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...)
  +APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...)
   {
       char *cp, *argp, *res;
   
  
  
  
  1.6       +6 -6      apache-2.0/src/lib/apr/tables/apr_hash.c
  
  Index: apr_hash.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/apr_hash.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_hash.c	2000/10/16 02:58:14	1.5
  +++ apr_hash.c	2000/10/16 06:04:49	1.6
  @@ -127,7 +127,7 @@
      return apr_pcalloc(ht->pool, sizeof(*ht->array) * (ht->max + 1));
   }
   
  -APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool)
  +APR_DECLARE(apr_hash_t *) apr_make_hash(apr_pool_t *pool)
   {
       apr_hash_t *ht;
       ht = apr_palloc(pool, sizeof(apr_hash_t));
  @@ -143,7 +143,7 @@
    * Hash iteration functions.
    */
   
  -APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi)
  +APR_DECLARE(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi)
   {
       hi->this = hi->next;
       while (!hi->this) {
  @@ -155,7 +155,7 @@
       return hi;
   }
   
  -APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht)
  +APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht)
   {
       apr_hash_index_t *hi;
       hi = apr_palloc(ht->pool, sizeof(*hi));
  @@ -166,7 +166,7 @@
       return apr_hash_next(hi);
   }
   
  -APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi,
  +APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi,
   			       const void **key,
   			       apr_size_t *klen,
   			       void **val)
  @@ -280,7 +280,7 @@
       return hep;
   }
   
  -APR_EXPORT(void *) apr_hash_get(apr_hash_t *ht,
  +APR_DECLARE(void *) apr_hash_get(apr_hash_t *ht,
   			       const void *key,
   			       apr_ssize_t klen)
   {
  @@ -292,7 +292,7 @@
   	return NULL;
   }
   
  -APR_EXPORT(void) apr_hash_set(apr_hash_t *ht,
  +APR_DECLARE(void) apr_hash_set(apr_hash_t *ht,
   			     const void *key,
   			     apr_ssize_t klen,
   			     const void *val)
  
  
  
  1.6       +32 -32    apache-2.0/src/lib/apr/tables/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/apr_tables.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_tables.c	2000/08/22 21:55:34	1.5
  +++ apr_tables.c	2000/10/16 06:04:49	1.6
  @@ -108,7 +108,7 @@
       res->nalloc = nelts;	/* ...but this many allocated */
   }
   
  -APR_EXPORT(apr_array_header_t *) apr_make_array(apr_pool_t *p,
  +APR_DECLARE(apr_array_header_t *) apr_make_array(apr_pool_t *p,
   						int nelts, int elt_size)
   {
       apr_array_header_t *res;
  @@ -118,7 +118,7 @@
       return res;
   }
   
  -APR_EXPORT(void *) apr_push_array(apr_array_header_t *arr)
  +APR_DECLARE(void *) apr_push_array(apr_array_header_t *arr)
   {
       if (arr->nelts == arr->nalloc) {
   	int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2;
  @@ -135,7 +135,7 @@
       return arr->elts + (arr->elt_size * (arr->nelts - 1));
   }
   
  -APR_EXPORT(void) apr_array_cat(apr_array_header_t *dst,
  +APR_DECLARE(void) apr_array_cat(apr_array_header_t *dst,
   			       const apr_array_header_t *src)
   {
       int elt_size = dst->elt_size;
  @@ -160,7 +160,7 @@
       dst->nelts += src->nelts;
   }
   
  -APR_EXPORT(apr_array_header_t *) apr_copy_array(apr_pool_t *p,
  +APR_DECLARE(apr_array_header_t *) apr_copy_array(apr_pool_t *p,
   						const apr_array_header_t *arr)
   {
       apr_array_header_t *res = apr_make_array(p, arr->nalloc, arr->elt_size);
  @@ -186,7 +186,7 @@
       res->nalloc = arr->nelts;	/* Force overflow on push */
   }
   
  -APR_EXPORT(apr_array_header_t *)
  +APR_DECLARE(apr_array_header_t *)
       apr_copy_array_hdr(apr_pool_t *p,
   		       const apr_array_header_t *arr)
   {
  @@ -200,7 +200,7 @@
   
   /* The above is used here to avoid consing multiple new array bodies... */
   
  -APR_EXPORT(apr_array_header_t *)
  +APR_DECLARE(apr_array_header_t *)
       apr_append_arrays(apr_pool_t *p,
   		      const apr_array_header_t *first,
   		      const apr_array_header_t *second)
  @@ -217,7 +217,7 @@
    * or if there are no elements in the array.
    * If sep is non-NUL, it will be inserted between elements as a separator.
    */
  -APR_EXPORT(char *) apr_array_pstrcat(apr_pool_t *p,
  +APR_DECLARE(char *) apr_array_pstrcat(apr_pool_t *p,
   				     const apr_array_header_t *arr,
   				     const char sep)
   {
  @@ -294,7 +294,7 @@
   #endif /* MAKE_TABLE_PROFILE */
   
   
  -APR_EXPORT(apr_table_t *) apr_make_table(apr_pool_t *p, int nelts)
  +APR_DECLARE(apr_table_t *) apr_make_table(apr_pool_t *p, int nelts)
   {
       apr_table_t *t = apr_palloc(p, sizeof(apr_table_t));
   
  @@ -305,7 +305,7 @@
       return t;
   }
   
  -APR_EXPORT(apr_btable_t *) apr_make_btable(apr_pool_t *p, int nelts)
  +APR_DECLARE(apr_btable_t *) apr_make_btable(apr_pool_t *p, int nelts)
   {
       apr_btable_t *t = apr_palloc(p, sizeof(apr_btable_t));
   
  @@ -316,7 +316,7 @@
       return t;
   }
   
  -APR_EXPORT(apr_table_t *) apr_copy_table(apr_pool_t *p, const apr_table_t *t)
  +APR_DECLARE(apr_table_t *) apr_copy_table(apr_pool_t *p, const apr_table_t *t)
   {
       apr_table_t *new = apr_palloc(p, sizeof(apr_table_t));
   
  @@ -335,7 +335,7 @@
       return new;
   }
   
  -APR_EXPORT(apr_btable_t *) apr_copy_btable(apr_pool_t *p,
  +APR_DECLARE(apr_btable_t *) apr_copy_btable(apr_pool_t *p,
   					   const apr_btable_t *t)
   {
       apr_btable_t *new = apr_palloc(p, sizeof(apr_btable_entry_t));
  @@ -355,17 +355,17 @@
       return new;
   }
   
  -APR_EXPORT(void) apr_clear_table(apr_table_t *t)
  +APR_DECLARE(void) apr_clear_table(apr_table_t *t)
   {
       t->a.nelts = 0;
   }
   
  -APR_EXPORT(void) apr_clear_btable(apr_btable_t *t)
  +APR_DECLARE(void) apr_clear_btable(apr_btable_t *t)
   {
       t->a.nelts = 0;
   }
   
  -APR_EXPORT(const char *) apr_table_get(const apr_table_t *t, const char *key)
  +APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *key)
   {
       apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
       int i;
  @@ -383,7 +383,7 @@
       return NULL;
   }
   
  -APR_EXPORT(const apr_item_t *) apr_btable_get(const apr_btable_t *t,
  +APR_DECLARE(const apr_item_t *) apr_btable_get(const apr_btable_t *t,
   					      const char *key)
   {
       apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts;
  @@ -402,7 +402,7 @@
       return NULL;
   }
   
  -APR_EXPORT(void) apr_table_set(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_set(apr_table_t *t, const char *key,
   			       const char *val)
   {
       register int i, j, k;
  @@ -436,7 +436,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_btable_set(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_set(apr_btable_t *t, const char *key,
   				size_t size, const void *val)
   {
       register int i, j, k;
  @@ -476,7 +476,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_table_setn(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_setn(apr_table_t *t, const char *key,
   				const char *val)
   {
       register int i, j, k;
  @@ -523,7 +523,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_btable_setn(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_setn(apr_btable_t *t, const char *key,
   				 size_t size, const void *val)
   {
       register int i, j, k;
  @@ -575,7 +575,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_table_unset(apr_table_t *t, const char *key)
  +APR_DECLARE(void) apr_table_unset(apr_table_t *t, const char *key)
   {
       register int i, j, k;
       apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
  @@ -600,7 +600,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_btable_unset(apr_btable_t *t, const char *key)
  +APR_DECLARE(void) apr_btable_unset(apr_btable_t *t, const char *key)
   {
       register int i, j, k;
       apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts;
  @@ -625,7 +625,7 @@
       }
   }
   
  -APR_EXPORT(void) apr_table_merge(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_merge(apr_table_t *t, const char *key,
   				 const char *val)
   {
       apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
  @@ -643,7 +643,7 @@
       elts->val = apr_pstrdup(t->a.cont, val);
   }
   
  -APR_EXPORT(void) apr_table_mergen(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key,
   				  const char *val)
   {
       apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
  @@ -674,7 +674,7 @@
       elts->val = (char *)val;
   }
   
  -APR_EXPORT(void) apr_table_add(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_add(apr_table_t *t, const char *key,
   			       const char *val)
   {
       apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
  @@ -684,7 +684,7 @@
       elts->val = apr_pstrdup(t->a.cont, val);
   }
   
  -APR_EXPORT(void) apr_btable_add(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_add(apr_btable_t *t, const char *key,
   				size_t size, const void *val)
   {
       apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts;
  @@ -699,7 +699,7 @@
       elts->val = item;
   }
   
  -APR_EXPORT(void) apr_table_addn(apr_table_t *t, const char *key,
  +APR_DECLARE(void) apr_table_addn(apr_table_t *t, const char *key,
   				const char *val)
   {
       apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
  @@ -722,7 +722,7 @@
       elts->val = (char *)val;
   }
   
  -APR_EXPORT(void) apr_btable_addn(apr_btable_t *t, const char *key,
  +APR_DECLARE(void) apr_btable_addn(apr_btable_t *t, const char *key,
   				 size_t size, const void *val)
   {
       apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts;
  @@ -750,7 +750,7 @@
       elts->val = item;
   }
   
  -APR_EXPORT(apr_table_t *) apr_overlay_tables(apr_pool_t *p,
  +APR_DECLARE(apr_table_t *) apr_overlay_tables(apr_pool_t *p,
   					     const apr_table_t *overlay,
   					     const apr_table_t *base)
   {
  @@ -782,7 +782,7 @@
       return res;
   }
   
  -APR_EXPORT(apr_btable_t *) apr_overlay_btables(apr_pool_t *p,
  +APR_DECLARE(apr_btable_t *) apr_overlay_btables(apr_pool_t *p,
   					       const apr_btable_t *overlay,
   					       const apr_btable_t *base)
   {
  @@ -857,7 +857,7 @@
    *
    * So to make mod_file_cache easier to maintain, it's a good thing
    */
  -APR_EXPORT(void) apr_table_do(int (*comp) (void *, const char *, const char *),
  +APR_DECLARE(void) apr_table_do(int (*comp) (void *, const char *, const char *),
   			      void *rec, const apr_table_t *t, ...)
   {
       va_list vp;
  @@ -865,7 +865,7 @@
       apr_table_vdo(comp, rec, t, vp);
       va_end(vp);  
   } 
  -APR_EXPORT(void) apr_table_vdo(int (*comp) (void *, const char *, const char *),
  +APR_DECLARE(void) apr_table_vdo(int (*comp) (void *, const char *, const char *),
   				void *rec, const apr_table_t *t, va_list vp)
   {
       char *argp;
  @@ -913,7 +913,7 @@
   #define APR_OVERLAP_TABLES_ON_STACK	(512)
   #endif
   
  -APR_EXPORT(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b,
  +APR_DECLARE(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b,
   				    unsigned flags)
   {
       overlap_key cat_keys_buf[APR_OVERLAP_TABLES_ON_STACK];
  
  
  
  1.19      +2 -2      apache-2.0/src/lib/apr/time/unix/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/timestr.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- timestr.c	2000/08/06 06:07:33	1.18
  +++ timestr.c	2000/10/16 06:04:50	1.19
  @@ -68,11 +68,11 @@
   #endif
   /* End System Headers */
   
  -APR_VAR_EXPORT const char apr_month_snames[12][4] =
  +APR_DECLARE_DATA const char apr_month_snames[12][4] =
   {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
  -APR_VAR_EXPORT const char apr_day_snames[7][4] =
  +APR_DECLARE_DATA const char apr_day_snames[7][4] =
   {
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
  
  
  
  1.11      +2 -2      apache-2.0/src/lib/apr/time/win32/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/timestr.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- timestr.c	2000/08/06 06:07:33	1.10
  +++ timestr.c	2000/10/16 06:04:50	1.11
  @@ -55,11 +55,11 @@
   #include "atime.h"
   #include "apr_portable.h"
   
  -APR_VAR_EXPORT const char apr_month_snames[12][4] =
  +APR_DECLARE_DATA const char apr_month_snames[12][4] =
   {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
  -APR_VAR_EXPORT const char apr_day_snames[7][4] =
  +APR_DECLARE_DATA const char apr_day_snames[7][4] =
   {
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
  
  
  
  1.66      +23 -23    apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- buff.c	2000/10/11 07:41:06	1.65
  +++ buff.c	2000/10/16 06:04:51	1.66
  @@ -155,7 +155,7 @@
   /*
    * Create a new buffered stream
    */
  -API_EXPORT(BUFF *) ap_bcreate(apr_pool_t *p, int flags)
  +AP_DECLARE(BUFF *) ap_bcreate(apr_pool_t *p, int flags)
   {
       BUFF *fb;
   
  @@ -215,18 +215,18 @@
   /*
    * Push some I/O file descriptors onto the stream
    */
  -API_EXPORT(void) ap_bpush_socket(BUFF *fb, apr_socket_t *sock)
  +AP_DECLARE(void) ap_bpush_socket(BUFF *fb, apr_socket_t *sock)
   {
       fb->bsock = sock;
       apr_register_cleanup(fb->pool, fb, bcleanup, bcleanup);
   }
  -API_EXPORT(void) ap_bpop_socket(apr_socket_t **sock, BUFF *fb)
  +AP_DECLARE(void) ap_bpop_socket(apr_socket_t **sock, BUFF *fb)
   {
       *sock = fb->bsock;
       apr_kill_cleanup(fb->pool, fb, bcleanup);
   }
   
  -API_EXPORT(apr_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval)
  +AP_DECLARE(apr_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval)
   {
       switch (optname) {
       case BO_BYTECT:
  @@ -270,7 +270,7 @@
       return APR_EINVAL;
   }
   
  -API_EXPORT(apr_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval)
  +AP_DECLARE(apr_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval)
   {
       long int bs;
   
  @@ -329,7 +329,7 @@
   /*
    * Set a flag on (1) or off (0).
    */
  -API_EXPORT(int) ap_bsetflag(BUFF *fb, int flag, int value)
  +AP_DECLARE(int) ap_bsetflag(BUFF *fb, int flag, int value)
   {
       int old_flags = fb->flags;
   
  @@ -375,7 +375,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(void) ap_bhalfduplex(BUFF *fb)
  +AP_DECLARE(void) ap_bhalfduplex(BUFF *fb)
   {
       apr_status_t rv;
   
  @@ -457,7 +457,7 @@
    * Read up to nbyte bytes into buf.
    * If fewer than nbyte bytes are currently available, then return those.
    */
  -API_EXPORT(apr_status_t) ap_bread_core(BUFF *fb, void *buf, apr_size_t nbyte,
  +AP_DECLARE(apr_status_t) ap_bread_core(BUFF *fb, void *buf, apr_size_t nbyte,
                                         apr_ssize_t *bytes_read)
   {
       int nrd;
  @@ -555,7 +555,7 @@
    *  CR characters in the byte stream not immediately followed by a LF
    * will be preserved.
    */
  -API_EXPORT(int) ap_bgets(char *buff, int n, BUFF *fb)
  +AP_DECLARE(int) ap_bgets(char *buff, int n, BUFF *fb)
   {
       int ch, ct;
       apr_ssize_t i;
  @@ -634,7 +634,7 @@
    * Returns 1 on success, zero on end of transmission, or -1 on an error.
    *
    */
  -API_EXPORT(int) ap_blookc(BUFF *fb)
  +AP_DECLARE(int) ap_blookc(BUFF *fb)
   {
       int c;
   
  @@ -649,7 +649,7 @@
    * output a single character.  Used by ap_bputs when the buffer
    * is full... and so it'll cause the buffer to be flushed first.
    */
  -API_EXPORT(int) ap_bflsbuf(int c, BUFF *fb)
  +AP_DECLARE(int) ap_bflsbuf(int c, BUFF *fb)
   {
       char ss[1];
       apr_ssize_t bytes_written;
  @@ -667,7 +667,7 @@
   /*
    * Fill the buffer and read a character from it
    */
  -API_EXPORT(int) ap_bfilbuf(BUFF *fb)
  +AP_DECLARE(int) ap_bfilbuf(BUFF *fb)
   {
       apr_status_t rv;
       apr_ssize_t i;
  @@ -992,7 +992,7 @@
    * It is worth noting that if an error occurs, the buffer is in an unknown
    * state.
    */
  -API_EXPORT(apr_status_t) ap_bwrite_core(BUFF *fb, const void *buf, apr_size_t nbyte,
  +AP_DECLARE(apr_status_t) ap_bwrite_core(BUFF *fb, const void *buf, apr_size_t nbyte,
                                     apr_ssize_t *bytes_written)
   {
       int amt;
  @@ -1054,7 +1054,7 @@
   /*
    * Flushes the buffered stream.
    */
  -API_EXPORT(apr_status_t) ap_bflush(BUFF *fb)
  +AP_DECLARE(apr_status_t) ap_bflush(BUFF *fb)
   {
       apr_ssize_t n;       /* Placeholder; not ever used */
   
  @@ -1068,7 +1068,7 @@
       return bflush_core(fb, &n);
   }
   
  -API_EXPORT(apr_status_t) ap_bshutdown(BUFF *fb, int how)
  +AP_DECLARE(apr_status_t) ap_bshutdown(BUFF *fb, int how)
   {
       apr_status_t status;
       
  @@ -1087,7 +1087,7 @@
    * Sets the EOF flag to indicate no futher data can be read,
    * and the EOUT flag to indicate no further data can be written.
    */
  -API_EXPORT(apr_status_t) ap_bclose(BUFF *fb)
  +AP_DECLARE(apr_status_t) ap_bclose(BUFF *fb)
   {
       apr_status_t rc1, rc2;
   
  @@ -1119,7 +1119,7 @@
   /*
    * returns the number of bytes written or -1 on error
    */
  -API_EXPORT(int) ap_bputs(const char *x, BUFF *fb)
  +AP_DECLARE(int) ap_bputs(const char *x, BUFF *fb)
   {
       apr_status_t rv;
       int j = strlen(x);
  @@ -1136,7 +1136,7 @@
   /*
    * returns the number of bytes written or -1 on error
    */
  -API_EXPORT(int) ap_vbputstrs(BUFF *fb, va_list va)
  +AP_DECLARE(int) ap_vbputstrs(BUFF *fb, va_list va)
   {
       int j, k;
       apr_ssize_t i;
  @@ -1162,7 +1162,7 @@
   /*
    * returns the number of bytes written or -1 on error
    */
  -API_EXPORT_NONSTD(int) ap_bputstrs(BUFF *fb, ...)
  +AP_DECLARE_NONSTD(int) ap_bputstrs(BUFF *fb, ...)
   {
       va_list va;
       int n;
  @@ -1173,7 +1173,7 @@
       return n;
   }
   
  -API_EXPORT(void) ap_bonerror(BUFF *fb,
  +AP_DECLARE(void) ap_bonerror(BUFF *fb,
                                void (*error) (BUFF *, int, void *, apr_status_t),
                                void *data)
   {
  @@ -1186,7 +1186,7 @@
       BUFF *fb;
   };
   
  -API_EXPORT(apr_status_t) ap_berror(BUFF *fb)
  +AP_DECLARE(apr_status_t) ap_berror(BUFF *fb)
   {
       return fb->berrno;
   }
  @@ -1221,7 +1221,7 @@
       return 0;
   }
   
  -API_EXPORT_NONSTD(int) ap_bprintf(BUFF *fb, const char *fmt, ...)
  +AP_DECLARE_NONSTD(int) ap_bprintf(BUFF *fb, const char *fmt, ...)
   {
       va_list ap;
       int res;
  @@ -1232,7 +1232,7 @@
       return res;
   }
   
  -API_EXPORT(int) ap_vbprintf(BUFF *fb, const char *fmt, va_list ap)
  +AP_DECLARE(int) ap_vbprintf(BUFF *fb, const char *fmt, va_list ap)
   {
       struct bprintf_data b;
       int res;
  
  
  
  1.80      +40 -40    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.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- http_config.c	2000/10/05 22:34:54	1.79
  +++ http_config.c	2000/10/16 06:04:51	1.80
  @@ -93,13 +93,13 @@
   #include <strings.h>
   #endif
   
  -API_VAR_EXPORT const char *ap_server_argv0;
  +AP_DECLARE_DATA const char *ap_server_argv0;
   
  -API_VAR_EXPORT const char *ap_server_root;
  +AP_DECLARE_DATA const char *ap_server_root;
   
  -API_VAR_EXPORT apr_array_header_t *ap_server_pre_read_config;
  -API_VAR_EXPORT apr_array_header_t *ap_server_post_read_config;
  -API_VAR_EXPORT apr_array_header_t *ap_server_config_defines;
  +AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config;
  +AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config;
  +AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
   
   AP_HOOK_STRUCT(
   	    AP_HOOK_LINK(header_parser)
  @@ -138,8 +138,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;
  +AP_DECLARE_DATA module *top_module = NULL;
  +AP_DECLARE_DATA module **ap_loaded_modules=NULL;
   
   typedef int (*handler_func) (request_rec *);
   typedef void *(*dir_maker_func) (apr_pool_t *, char *);
  @@ -157,7 +157,7 @@
    */
   
   #ifndef ap_get_module_config
  -API_EXPORT(void *) ap_get_module_config(void *conf_vector, module *m)
  +AP_DECLARE(void *) ap_get_module_config(void *conf_vector, module *m)
   {
       void **confv = (void **) conf_vector;
       return confv[m->module_index];
  @@ -165,7 +165,7 @@
   #endif
   
   #ifndef ap_set_module_config
  -API_EXPORT(void) ap_set_module_config(void *conf_vector, module *m, void *val)
  +AP_DECLARE(void) ap_set_module_config(void *conf_vector, module *m, void *val)
   {
       void **confv = (void **) conf_vector;
       confv[m->module_index] = val;
  @@ -259,7 +259,7 @@
       return create_empty_config(p);
   }
   
  -CORE_EXPORT(void *) ap_create_per_dir_config(apr_pool_t *p)
  +AP_CORE_DECLARE(void *) ap_create_per_dir_config(apr_pool_t *p)
   {
       return create_empty_config(p);
   }
  @@ -379,7 +379,7 @@
       return HTTP_INTERNAL_SERVER_ERROR;
   }
   
  -API_EXPORT(int) ap_method_is_limited(cmd_parms *cmd, const char *method) {
  +AP_DECLARE(int) ap_method_is_limited(cmd_parms *cmd, const char *method) {
       int methnum;
       int i;
       char **xmethod;
  @@ -407,7 +407,7 @@
       return 0;
   }
   
  -API_EXPORT(void) ap_register_hooks(module *m)
  +AP_DECLARE(void) ap_register_hooks(module *m)
       {
       if(m->register_hooks)
   	{
  @@ -423,7 +423,7 @@
   
   /* One-time setup for precompiled modules --- NOT to be done on restart */
   
  -API_EXPORT(void) ap_add_module(module *m)
  +AP_DECLARE(void) ap_add_module(module *m)
   {
       /* This could be called from an AddModule httpd.conf command,
        * after the file has been linked and the module structure within it
  @@ -488,7 +488,7 @@
    * all our current data. I.e. when doing a restart.
    */
   
  -API_EXPORT(void) ap_remove_module(module *m)
  +AP_DECLARE(void) ap_remove_module(module *m)
   {
       module *modp;
   
  @@ -523,7 +523,7 @@
       total_modules--;
   }
   
  -API_EXPORT(void) ap_add_loaded_module(module *mod)
  +AP_DECLARE(void) ap_add_loaded_module(module *mod)
   {
       module **m;
   
  @@ -546,7 +546,7 @@
       *m = NULL;
   }
   
  -API_EXPORT(void) ap_remove_loaded_module(module *mod)
  +AP_DECLARE(void) ap_remove_loaded_module(module *mod)
   {
       module **m;
       module **m2;
  @@ -575,7 +575,7 @@
       *m = NULL;
   }
   
  -API_EXPORT(void) ap_setup_prelinked_modules(process_rec *process)
  +AP_DECLARE(void) ap_setup_prelinked_modules(process_rec *process)
   {
       module **m;
       module **m2;
  @@ -611,12 +611,12 @@
       ap_sort_hooks();
   }
   
  -API_EXPORT(const char *) ap_find_module_name(module *m)
  +AP_DECLARE(const char *) ap_find_module_name(module *m)
   {
       return m->name;
   }
   
  -API_EXPORT(module *) ap_find_linked_module(const char *name)
  +AP_DECLARE(module *) ap_find_linked_module(const char *name)
   {
       module *modp;
   
  @@ -628,7 +628,7 @@
   }
   
   /* Add a named module.  Returns 1 if module found, 0 otherwise.  */
  -API_EXPORT(int) ap_add_named_module(const char *name)
  +AP_DECLARE(int) ap_add_named_module(const char *name)
   {
       module *modp;
       int i = 0;
  @@ -647,7 +647,7 @@
   }
   
   /* Clear the internal list of modules, in preparation for starting over. */
  -API_EXPORT(void) ap_clear_module_list()
  +AP_DECLARE(void) ap_clear_module_list()
   {
       module **m = &top_module;
       module **next_m;
  @@ -823,7 +823,7 @@
       }
   }
   
  -CORE_EXPORT(const command_rec *) ap_find_command(const char *name, const command_rec *cmds)
  +AP_CORE_DECLARE(const command_rec *) ap_find_command(const char *name, const command_rec *cmds)
   {
       while (cmds->name)
   	if (!strcasecmp(name, cmds->name))
  @@ -834,7 +834,7 @@
       return NULL;
   }
   
  -CORE_EXPORT(const command_rec *) ap_find_command_in_modules(const char *cmd_name, module **mod)
  +AP_CORE_DECLARE(const command_rec *) ap_find_command_in_modules(const char *cmd_name, module **mod)
   {
       const command_rec *cmdp;
       module *modp;
  @@ -848,7 +848,7 @@
       return NULL;
   }
   
  -CORE_EXPORT(void *) ap_set_config_vectors(cmd_parms *parms, void *config, module *mod)
  +AP_CORE_DECLARE(void *) ap_set_config_vectors(cmd_parms *parms, void *config, module *mod)
   {
       void *mconfig = ap_get_module_config(config, mod);
       void *sconfig = ap_get_module_config(parms->server->module_config, mod);
  @@ -1052,7 +1052,7 @@
       /* NOTREACHED */
   }
   
  -API_EXPORT(const char *) ap_walk_config(ap_directive_t *current,
  +AP_DECLARE(const char *) ap_walk_config(ap_directive_t *current,
   					cmd_parms *parms, void *config)
   {
       void *oldconfig = parms->context;
  @@ -1079,7 +1079,7 @@
   }
   
   
  -API_EXPORT(const char *) ap_build_config(cmd_parms *parms,
  +AP_DECLARE(const char *) ap_build_config(cmd_parms *parms,
   					 apr_pool_t *p, apr_pool_t *temp_pool,
   					 ap_directive_t **conftree)
   {
  @@ -1130,7 +1130,7 @@
    * Generic command functions...
    */
   
  -API_EXPORT_NONSTD(const char *) ap_set_string_slot(cmd_parms *cmd,
  +AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *cmd,
   						   void *struct_ptr,
   						   const char *arg)
   {
  @@ -1141,7 +1141,7 @@
       return NULL;
   }
   
  -API_EXPORT_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *cmd,
  +AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *cmd,
   							 void *struct_ptr,
   							 const char *arg_)
   {
  @@ -1154,7 +1154,7 @@
       return NULL;
   }
   
  -API_EXPORT_NONSTD(const char *) ap_set_flag_slot(cmd_parms *cmd,
  +AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *cmd,
                                                    void *struct_ptr_v, int arg)
   {
       /* This one's pretty generic too... */
  @@ -1165,7 +1165,7 @@
       return NULL;
   }
   
  -API_EXPORT_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, char *struct_ptr, 
  +AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, char *struct_ptr, 
                                                    const char *arg)
   {
       /* Prepend server_root to relative arg.
  @@ -1189,14 +1189,14 @@
   static cmd_parms default_parms =
   {NULL, 0, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
   
  -API_EXPORT(const char *) ap_server_root_relative(apr_pool_t *p, const char *file)
  +AP_DECLARE(const char *) ap_server_root_relative(apr_pool_t *p, const char *file)
   {
       if(ap_os_is_path_absolute(file))
   	return file;
       return ap_make_full_path(p, ap_server_root, file);
   }
   
  -API_EXPORT(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
  +AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
   {
       char l[MAX_STRING_LEN];
       const char *args;
  @@ -1433,7 +1433,7 @@
       ap_cfg_closefile(cfp);
   }
   
  -API_EXPORT(void)ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
  +AP_DECLARE(void)ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
                                          apr_pool_t *p, apr_pool_t *ptemp)
   {
       const char *errmsg;
  @@ -1536,7 +1536,7 @@
       return OK;
   }
   
  -CORE_EXPORT(const char *) ap_init_virtual_host(apr_pool_t *p, const char *hostname,
  +AP_CORE_DECLARE(const char *) ap_init_virtual_host(apr_pool_t *p, const char *hostname,
   			      server_rec *main_server, server_rec **ps)
   {
       server_rec *s = (server_rec *) apr_pcalloc(p, sizeof(server_rec));
  @@ -1578,7 +1578,7 @@
   }
   
   
  -API_EXPORT(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server)
  +AP_DECLARE(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server)
   {
       server_rec *virt;
   
  @@ -1656,7 +1656,7 @@
   }
   
   
  -API_EXPORT(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp,
  +AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp,
                                          const char *confname, 
                                          ap_directive_t **conftree)
   {
  @@ -1688,7 +1688,7 @@
                                (*m->create_dir_config)(p, NULL));
   }
   
  -API_EXPORT(void) ap_run_rewrite_args(process_rec *process)
  +AP_DECLARE(void) ap_run_rewrite_args(process_rec *process)
   {
       module *m;
   
  @@ -1697,7 +1697,7 @@
               (*m->rewrite_args) (process);
   }
   
  -API_EXPORT(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
  +AP_DECLARE(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
   {
       ap_run_post_config(pconf,plog,ptemp,s); 
       init_handlers(pconf);
  @@ -1789,7 +1789,7 @@
    * the directive arguments, in what module they are handled, and in
    * what parts of the configuration they are allowed.  Used for httpd -h.
    */
  -API_EXPORT(void) ap_show_directives()
  +AP_DECLARE(void) ap_show_directives()
   {
       const command_rec *pc;
       int n;
  @@ -1804,7 +1804,7 @@
   }
   
   /* Show the preloaded module names.  Used for httpd -l. */
  -API_EXPORT(void) ap_show_modules()
  +AP_DECLARE(void) ap_show_modules()
   {
       int n;
   
  
  
  
  1.52      +1 -1      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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- http_connection.c	2000/10/06 06:07:07	1.51
  +++ http_connection.c	2000/10/16 06:04:51	1.52
  @@ -204,7 +204,7 @@
       ap_bclose(c->client);
   }
   
  -CORE_EXPORT(void) ap_process_connection(conn_rec *c)
  +AP_CORE_DECLARE(void) ap_process_connection(conn_rec *c)
   {
       ap_update_vhost_given_ip(c);
   
  
  
  
  1.171     +28 -28    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.170
  retrieving revision 1.171
  diff -u -r1.170 -r1.171
  --- http_core.c	2000/10/15 22:42:59	1.170
  +++ http_core.c	2000/10/16 06:04:51	1.171
  @@ -375,7 +375,7 @@
    * these are part of the core server config.
    */
   
  -CORE_EXPORT(void) ap_add_per_dir_conf(server_rec *s, void *dir_config)
  +AP_CORE_DECLARE(void) ap_add_per_dir_conf(server_rec *s, void *dir_config)
   {
       core_server_config *sconf = ap_get_module_config(s->module_config,
   						     &core_module);
  @@ -384,7 +384,7 @@
       *new_space = dir_config;
   }
   
  -CORE_EXPORT(void) ap_add_per_url_conf(server_rec *s, void *url_config)
  +AP_CORE_DECLARE(void) ap_add_per_url_conf(server_rec *s, void *url_config)
   {
       core_server_config *sconf = ap_get_module_config(s->module_config,
   						     &core_module);
  @@ -393,7 +393,7 @@
       *new_space = url_config;
   }
   
  -CORE_EXPORT(void) ap_add_file_conf(core_dir_config *conf, void *url_config)
  +AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config)
   {
       void **new_space = (void **)apr_push_array(conf->sec);
       
  @@ -510,7 +510,7 @@
    * here...
    */
   
  -API_EXPORT(int) ap_allow_options(request_rec *r)
  +AP_DECLARE(int) ap_allow_options(request_rec *r)
   {
       core_dir_config *conf = 
         (core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module); 
  @@ -518,7 +518,7 @@
       return conf->opts; 
   } 
   
  -API_EXPORT(int) ap_allow_overrides(request_rec *r) 
  +AP_DECLARE(int) ap_allow_overrides(request_rec *r) 
   { 
       core_dir_config *conf;
       conf = (core_dir_config *)ap_get_module_config(r->per_dir_config,
  @@ -527,7 +527,7 @@
       return conf->override; 
   } 
   
  -API_EXPORT(const char *) ap_auth_type(request_rec *r)
  +AP_DECLARE(const char *) ap_auth_type(request_rec *r)
   {
       core_dir_config *conf;
   
  @@ -536,7 +536,7 @@
       return conf->ap_auth_type;
   }
   
  -API_EXPORT(const char *) ap_auth_name(request_rec *r)
  +AP_DECLARE(const char *) ap_auth_name(request_rec *r)
   {
       core_dir_config *conf;
   
  @@ -545,7 +545,7 @@
       return conf->ap_auth_name;
   }
   
  -API_EXPORT(const char *) ap_default_type(request_rec *r)
  +AP_DECLARE(const char *) ap_default_type(request_rec *r)
   {
       core_dir_config *conf;
   
  @@ -556,7 +556,7 @@
                  : DEFAULT_CONTENT_TYPE;
   }
   
  -API_EXPORT(const char *) ap_document_root(request_rec *r) /* Don't use this! */
  +AP_DECLARE(const char *) ap_document_root(request_rec *r) /* Don't use this! */
   {
       core_server_config *conf;
   
  @@ -565,7 +565,7 @@
       return conf->ap_document_root;
   }
   
  -API_EXPORT(const apr_array_header_t *) ap_requires(request_rec *r)
  +AP_DECLARE(const apr_array_header_t *) ap_requires(request_rec *r)
   {
       core_dir_config *conf;
   
  @@ -574,7 +574,7 @@
       return conf->ap_requires;
   }
   
  -API_EXPORT(int) ap_satisfies(request_rec *r)
  +AP_DECLARE(int) ap_satisfies(request_rec *r)
   {
       core_dir_config *conf;
   
  @@ -632,7 +632,7 @@
       conn->double_reverse = -1;
   }
   
  -API_EXPORT(const char *) ap_get_remote_host(conn_rec *conn, void *dir_config,
  +AP_DECLARE(const char *) ap_get_remote_host(conn_rec *conn, void *dir_config,
   					    int type)
   {
       struct in_addr *iaddr;
  @@ -700,7 +700,7 @@
       }
   }
   
  -API_EXPORT(const char *) ap_get_remote_logname(request_rec *r)
  +AP_DECLARE(const char *) ap_get_remote_logname(request_rec *r)
   {
       core_dir_config *dir_conf;
   
  @@ -733,7 +733,7 @@
    * The assumption is that DNS lookups are sufficiently quick...
    * -- fanf 1998-10-03
    */
  -API_EXPORT(const char *) ap_get_server_name(request_rec *r)
  +AP_DECLARE(const char *) ap_get_server_name(request_rec *r)
   {
       conn_rec *conn = r->connection;
       core_dir_config *d;
  @@ -767,7 +767,7 @@
       return r->server->server_hostname;
   }
   
  -API_EXPORT(unsigned) ap_get_server_port(const request_rec *r)
  +AP_DECLARE(unsigned) ap_get_server_port(const request_rec *r)
   {
       unsigned port;
       core_dir_config *d =
  @@ -784,7 +784,7 @@
       return port;
   }
   
  -API_EXPORT(char *) ap_construct_url(apr_pool_t *p, const char *uri,
  +AP_DECLARE(char *) ap_construct_url(apr_pool_t *p, const char *uri,
   				    request_rec *r)
   {
       unsigned port = ap_get_server_port(r);
  @@ -796,7 +796,7 @@
       return apr_psprintf(p, "%s://%s:%u%s", ap_http_method(r), host, port, uri);
   }
   
  -API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r)
  +AP_DECLARE(unsigned long) ap_get_limit_req_body(const request_rec *r)
   {
       core_dir_config *d =
         (core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
  @@ -968,7 +968,7 @@
       return buffer;
   }
   
  -API_EXPORT (file_type_e) ap_get_win32_interpreter(const  request_rec *r, 
  +AP_DECLARE (file_type_e) ap_get_win32_interpreter(const  request_rec *r, 
                                                     char** interpreter,
                                                     char** arguments)
   {
  @@ -1108,7 +1108,7 @@
       return NULL;
   }
   
  -API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd,
  +AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd,
   					      unsigned forbidden)
   {
       const char *gt = (cmd->cmd->name[0] == '<'
  @@ -1234,7 +1234,7 @@
       return NULL;
   }
   
  -API_EXPORT(void) ap_custom_response(request_rec *r, int status, char *string)
  +AP_DECLARE(void) ap_custom_response(request_rec *r, int status, char *string)
   {
       core_dir_config *conf = 
   	ap_get_module_config(r->per_dir_config, &core_module);
  @@ -1460,7 +1460,7 @@
       return NULL;
   }
   
  -CORE_EXPORT_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy,
  +AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy,
   						  const char *arg) {
       const char *limited_methods = ap_getword(cmd->pool, &arg, '>');
       void *tog = cmd->cmd->cmd_data;
  @@ -1781,7 +1781,7 @@
       }
   }
   
  -API_EXPORT(int) ap_exists_config_define(const char *name)
  +AP_DECLARE(int) ap_exists_config_define(const char *name)
   {
       char **defines;
       int i;
  @@ -2228,7 +2228,7 @@
       return NULL;
   }
   
  -API_EXPORT(const char *) ap_psignature(const char *prefix, request_rec *r)
  +AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r)
   {
       char sport[20];
       core_dir_config *conf;
  @@ -2306,12 +2306,12 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(const char *) ap_get_server_version(void)
  +AP_DECLARE(const char *) ap_get_server_version(void)
   {
       return (server_version ? server_version : AP_SERVER_BASEVERSION);
   }
   
  -API_EXPORT(void) ap_add_version_component(apr_pool_t *pconf, const char *component)
  +AP_DECLARE(void) ap_add_version_component(apr_pool_t *pconf, const char *component)
   {
       if (! version_locked) {
           /*
  @@ -2484,7 +2484,7 @@
       return NULL;
   }
   
  -API_EXPORT(size_t) ap_get_limit_xml_body(const request_rec *r)
  +AP_DECLARE(size_t) ap_get_limit_xml_body(const request_rec *r)
   {
       core_dir_config *conf;
   
  @@ -2866,7 +2866,7 @@
    * Core handlers for various phases of server operation...
    */
   
  -API_EXPORT_NONSTD(int) ap_core_translate(request_rec *r)
  +AP_DECLARE_NONSTD(int) ap_core_translate(request_rec *r)
   {
       void *sconf = r->server->module_config;
       core_server_config *conf = ap_get_module_config(sconf, &core_module);
  @@ -3587,7 +3587,7 @@
       ap_register_output_filter("BUFFER", buffer_filter, AP_FTYPE_CONNECTION);
   }
   
  -API_VAR_EXPORT module core_module = {
  +AP_DECLARE_DATA 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.70      +8 -8      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- http_log.c	2000/08/06 14:34:22	1.69
  +++ http_log.c	2000/10/16 06:04:52	1.70
  @@ -311,7 +311,7 @@
       }
   }
   
  -API_EXPORT(void) ap_error_log2stderr(server_rec *s) {
  +AP_DECLARE(void) ap_error_log2stderr(server_rec *s) {
       apr_file_t *errfile = NULL;
   
       apr_open_stderr(&errfile, s->process->pool);        
  @@ -444,7 +444,7 @@
   #endif
   }
       
  -API_EXPORT(void) ap_log_error(const char *file, int line, int level,
  +AP_DECLARE(void) ap_log_error(const char *file, int line, int level,
   			      apr_status_t status, const server_rec *s, 
                                 const char *fmt, ...)
   {
  @@ -455,7 +455,7 @@
       va_end(args);
   }
   
  -API_EXPORT(void) ap_log_perror(const char *file, int line, int level,
  +AP_DECLARE(void) ap_log_perror(const char *file, int line, int level,
   			      apr_status_t status, apr_pool_t *p, 
                                 const char *fmt, ...)
   {
  @@ -466,7 +466,7 @@
       va_end(args);
   }
   
  -API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
  +AP_DECLARE(void) ap_log_rerror(const char *file, int line, int level,
   			       apr_status_t status, const request_rec *r, 
                                  const char *fmt, ...)
   {
  @@ -535,7 +535,7 @@
       saved_pid = mypid;
   }
   
  -API_EXPORT(void) ap_log_assert(const char *szExp, const char *szFile, int nLine)
  +AP_DECLARE(void) ap_log_assert(const char *szExp, const char *szFile, int nLine)
   {
       char time_str[APR_CTIME_LEN];
   
  @@ -675,7 +675,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program)
  +AP_DECLARE(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program)
   {
       piped_log *pl;
   
  @@ -708,7 +708,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program)
  +AP_DECLARE(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program)
   {
       piped_log *pl;
       apr_file_t *dummy = NULL;
  @@ -733,7 +733,7 @@
   
   #endif
   
  -API_EXPORT(void) ap_close_piped_log(piped_log *pl)
  +AP_DECLARE(void) ap_close_piped_log(piped_log *pl)
   {
       apr_run_cleanup(pl->p, pl, piped_log_cleanup);
   }
  
  
  
  1.174     +46 -46    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.173
  retrieving revision 1.174
  diff -u -r1.173 -r1.174
  --- http_protocol.c	2000/10/15 18:15:11	1.173
  +++ http_protocol.c	2000/10/16 06:04:52	1.174
  @@ -251,7 +251,7 @@
   static int internal_byterange(int, long *, request_rec *, const char **,
   			      apr_off_t *, apr_size_t *);
   
  -API_EXPORT(int) ap_set_byterange(request_rec *r)
  +AP_DECLARE(int) ap_set_byterange(request_rec *r)
   {
       const char *range, *if_range, *match;
       long range_start, range_end;
  @@ -324,7 +324,7 @@
       return 1;
   }
   
  -API_EXPORT(int) ap_each_byterange(request_rec *r, apr_off_t *offset,
  +AP_DECLARE(int) ap_each_byterange(request_rec *r, apr_off_t *offset,
   				  apr_size_t *length)
   {
       return internal_byterange(1, NULL, r, &r->range, offset, length);
  @@ -414,14 +414,14 @@
       return 1;
   }
   
  -API_EXPORT(int) ap_set_content_length(request_rec *r, long clength)
  +AP_DECLARE(int) ap_set_content_length(request_rec *r, long clength)
   {
       r->clength = clength;
       apr_table_setn(r->headers_out, "Content-Length", apr_psprintf(r->pool, "%ld", clength));
       return 0;
   }
   
  -API_EXPORT(int) ap_set_keepalive(request_rec *r)
  +AP_DECLARE(int) ap_set_keepalive(request_rec *r)
   {
       int ka_sent = 0;
       int wimpy = ap_find_token(r->pool,
  @@ -519,7 +519,7 @@
    * to limit the number of calls to time().  We don't check for futurosity
    * unless the mtime is at least as new as the reference.
    */
  -API_EXPORT(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime)
  +AP_DECLARE(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime)
   {
       apr_time_t now;
   
  @@ -536,7 +536,7 @@
       return (mtime > now) ? now : mtime;
   }
   
  -API_EXPORT(int) ap_meets_conditions(request_rec *r)
  +AP_DECLARE(int) ap_meets_conditions(request_rec *r)
   {
       const char *etag = apr_table_get(r->headers_out, "ETag");
       const char *if_match, *if_modified_since, *if_unmodified, *if_nonematch;
  @@ -651,7 +651,7 @@
    * could be modified again in as short an interval.  We rationalize the
    * modification time we're given to keep it from being in the future.
    */
  -API_EXPORT(char *) ap_make_etag(request_rec *r, int force_weak)
  +AP_DECLARE(char *) ap_make_etag(request_rec *r, int force_weak)
   {
       char *etag;
       char *weak;
  @@ -687,7 +687,7 @@
       return etag;
   }
   
  -API_EXPORT(void) ap_set_etag(request_rec *r)
  +AP_DECLARE(void) ap_set_etag(request_rec *r)
   {
       char *etag;
       char *variant_etag, *vlv;
  @@ -736,7 +736,7 @@
    * of the mtime field in the request structure - rationalized to keep it from
    * being in the future.
    */
  -API_EXPORT(void) ap_set_last_modified(request_rec *r)
  +AP_DECLARE(void) ap_set_last_modified(request_rec *r)
   {
       apr_time_t mod_time = ap_rationalize_mtime(r, r->mtime);
       char *datestr = apr_palloc(r->pool, APR_RFC822_DATE_LEN);
  @@ -751,7 +751,7 @@
    * list.  Hopefully it (and other routines) can eventually be moved to
    * something like a mod_http_methods.c, complete with config stuff.
    */
  -API_EXPORT(int) ap_method_number_of(const char *method)
  +AP_DECLARE(int) ap_method_number_of(const char *method)
   {
       switch (*method) {
           case 'H':
  @@ -814,7 +814,7 @@
    * Turn a known method number into a name.  Doesn't work for
    * extension methods, obviously.
    */
  -API_EXPORT(const char *) ap_method_name_of(int methnum)
  +AP_DECLARE(const char *) ap_method_name_of(int methnum)
   {
       static const char *AP_HTTP_METHODS[METHODS] = { NULL };
   
  @@ -1061,7 +1061,7 @@
    * - sets r->uri to request uri (without r->args part)
    * - sets r->hostname (if not set already) from request (scheme://host:port)
    */
  -CORE_EXPORT(void) ap_parse_uri(request_rec *r, const char *uri)
  +AP_CORE_DECLARE(void) ap_parse_uri(request_rec *r, const char *uri)
   {
       int status = HTTP_OK;
   
  @@ -1483,7 +1483,7 @@
    * Support for the Basic authentication protocol, and a bit for Digest.
    */
   
  -API_EXPORT(void) ap_note_auth_failure(request_rec *r)
  +AP_DECLARE(void) ap_note_auth_failure(request_rec *r)
   {
       if (!strcasecmp(ap_auth_type(r), "Basic"))
           ap_note_basic_auth_failure(r);
  @@ -1491,7 +1491,7 @@
           ap_note_digest_auth_failure(r);
   }
   
  -API_EXPORT(void) ap_note_basic_auth_failure(request_rec *r)
  +AP_DECLARE(void) ap_note_basic_auth_failure(request_rec *r)
   {
       if (strcasecmp(ap_auth_type(r), "Basic"))
           ap_note_auth_failure(r);
  @@ -1502,7 +1502,7 @@
                             NULL));
   }
   
  -API_EXPORT(void) ap_note_digest_auth_failure(request_rec *r)
  +AP_DECLARE(void) ap_note_digest_auth_failure(request_rec *r)
   {
       apr_table_setn(r->err_headers_out,
   	    r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
  @@ -1510,7 +1510,7 @@
   		ap_auth_name(r), r->request_time));
   }
   
  -API_EXPORT(int) ap_get_basic_auth_pw(request_rec *r, const char **pw)
  +AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw)
   {
       const char *auth_line = apr_table_get(r->headers_in,
                                         r->proxyreq ? "Proxy-Authorization"
  @@ -1639,7 +1639,7 @@
    * If that sad event occurs, replace the code below with a linear search
    * from status_lines[shortcut[i]] to status_lines[shortcut[i+1]-1];
    */
  -API_EXPORT(int) ap_index_of_response(int status)
  +AP_DECLARE(int) ap_index_of_response(int status)
   {
       static int shortcut[6] = {0, LEVEL_200, LEVEL_300, LEVEL_400,
       LEVEL_500, RESPONSE_CODES};
  @@ -1663,7 +1663,7 @@
       return LEVEL_500;           /* 600 or above is also illegal */
   }
   
  -API_EXPORT(const char *) ap_get_status_line(int status)
  +AP_DECLARE(const char *) ap_get_status_line(int status)
   {
       return status_lines[ap_index_of_response(status)];
   }
  @@ -1673,13 +1673,13 @@
    * In other words, don't change this one without checking table_do in alloc.c.
    * It returns true unless there was a write error of some kind.
    */
  -API_EXPORT_NONSTD(int) ap_send_header_field(request_rec *r,
  +AP_DECLARE_NONSTD(int) ap_send_header_field(request_rec *r,
       const char *fieldname, const char *fieldval)
   {
       return (0 < checked_bputstrs(r, fieldname, ": ", fieldval, CRLF, NULL));
   }
   
  -API_EXPORT(void) ap_basic_http_header(request_rec *r)
  +AP_DECLARE(void) ap_basic_http_header(request_rec *r)
   {
       char *protocol;
       char *date = NULL;
  @@ -1757,7 +1757,7 @@
    * Create a new method list with the specified number of preallocated
    * extension slots.
    */
  -API_EXPORT(ap_method_list_t *) ap_make_method_list(apr_pool_t *p, int nelts)
  +AP_DECLARE(ap_method_list_t *) ap_make_method_list(apr_pool_t *p, int nelts)
   {
       ap_method_list_t *ml;
   
  @@ -1771,7 +1771,7 @@
    * Make a copy of a method list (primarily for subrequests that may
    * subsequently change it; don't want them changing the parent's, too!).
    */
  -API_EXPORT(void) ap_copy_method_list(ap_method_list_t *dest,
  +AP_DECLARE(void) ap_copy_method_list(ap_method_list_t *dest,
   				     ap_method_list_t *src)
   {
       int i;
  @@ -1789,7 +1789,7 @@
   /*
    * Invoke a callback routine for each method in the specified list.
    */
  -API_EXPORT_NONSTD(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
  +AP_DECLARE_NONSTD(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
   						       int mnum),
   				          void *rec,
   				          const ap_method_list_t *ml, ...)
  @@ -1800,7 +1800,7 @@
       va_end(vp);  
   }
   
  -API_EXPORT(void) ap_method_list_vdo(int (*comp) (void *mrec,
  +AP_DECLARE(void) ap_method_list_vdo(int (*comp) (void *mrec,
   						 const char *mname,
   						 int mnum),
   				    void *rec, const ap_method_list_t *ml,
  @@ -1813,7 +1813,7 @@
    * Return true if the specified HTTP method is in the provided
    * method list.
    */
  -API_EXPORT(int) ap_method_in_list(ap_method_list_t *l, const char *method)
  +AP_DECLARE(int) ap_method_in_list(ap_method_list_t *l, const char *method)
   {
       int methnum;
       int i;
  @@ -1844,7 +1844,7 @@
   /*
    * Add the specified method to a method list (if it isn't already there).
    */
  -API_EXPORT(void) ap_method_list_add(ap_method_list_t *l, const char *method)
  +AP_DECLARE(void) ap_method_list_add(ap_method_list_t *l, const char *method)
   {
       int methnum;
       int i;
  @@ -1877,7 +1877,7 @@
   /*
    * Remove the specified method from a method list.
    */
  -API_EXPORT(void) ap_method_list_remove(ap_method_list_t *l,
  +AP_DECLARE(void) ap_method_list_remove(ap_method_list_t *l,
   				       const char *method)
   {
       int methnum;
  @@ -1914,7 +1914,7 @@
   /*
    * Reset a method list to be completely empty.
    */
  -API_EXPORT(void) ap_clear_method_list(ap_method_list_t *l)
  +AP_DECLARE(void) ap_clear_method_list(ap_method_list_t *l)
   {
       l->method_mask = 0;
       l->method_list->nelts = 0;
  @@ -1966,7 +1966,7 @@
       return list + 2;
   }
   
  -API_EXPORT(int) ap_send_http_trace(request_rec *r)
  +AP_DECLARE(int) ap_send_http_trace(request_rec *r)
   {
       int rv;
   
  @@ -2107,7 +2107,7 @@
       }
   }
   
  -API_EXPORT(void) ap_send_http_header(request_rec *r)
  +AP_DECLARE(void) ap_send_http_header(request_rec *r)
   {
       int i;
       const long int zero = 0L;
  @@ -2221,7 +2221,7 @@
    * information for any wrappers around the response message body
    * (i.e., transfer encodings).  It should have been named finalize_response.
    */
  -API_EXPORT(void) ap_finalize_request_protocol(request_rec *r)
  +AP_DECLARE(void) ap_finalize_request_protocol(request_rec *r)
   {
       /* tell the filter chain there is no more content coming */
       if (!r->eos_sent) {
  @@ -2268,7 +2268,7 @@
    *    If an error occurs on input, we force an end to keepalive.
    */
   
  -API_EXPORT(int) ap_setup_client_block(request_rec *r, int read_policy)
  +AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy)
   {
       const char *tenc = apr_table_get(r->headers_in, "Transfer-Encoding");
       const char *lenp = apr_table_get(r->headers_in, "Content-Length");
  @@ -2347,7 +2347,7 @@
       return OK;
   }
   
  -API_EXPORT(int) ap_should_client_block(request_rec *r)
  +AP_DECLARE(int) ap_should_client_block(request_rec *r)
   {
       /* First check if we have already read the request body */
   
  @@ -2401,7 +2401,7 @@
    * hold a chunk-size line, including any extensions. For now, we'll leave
    * that to the caller, at least until we can come up with a better solution.
    */
  -API_EXPORT(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
  +AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
   {
       int c;
       apr_size_t len_to_read;
  @@ -2618,7 +2618,7 @@
    *    if ((retval = ap_discard_request_body(r)) != OK)
    *        return retval;
    */
  -API_EXPORT(int) ap_discard_request_body(request_rec *r)
  +AP_DECLARE(int) ap_discard_request_body(request_rec *r)
   {
       int rv;
   
  @@ -2650,7 +2650,7 @@
   /*
    * Send the body of a response to the client.
    */
  -API_EXPORT(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
  +AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
                                       apr_size_t len, apr_size_t *nbytes) 
   {
       ap_bucket_brigade *bb = NULL;
  @@ -2678,7 +2678,7 @@
   }
   #if 0
   /* Leave the old implementation around temporarily for reference purposes */
  -API_EXPORT(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
  +AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
                                      apr_size_t length, apr_size_t *nbytes) 
   {
       apr_status_t rv = APR_SUCCESS;
  @@ -2768,7 +2768,7 @@
   #endif
   
   /* send data from an in-memory buffer */
  -API_EXPORT(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
  +AP_DECLARE(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
                                size_t length)
   {
       ap_bucket_brigade *bb = NULL;
  @@ -2787,7 +2787,7 @@
   }
   #endif /* USE_MMAP_FILES */
   
  -API_EXPORT(int) ap_rputc(int c, request_rec *r)
  +AP_DECLARE(int) ap_rputc(int c, request_rec *r)
   {
       ap_bucket_brigade *bb = NULL;
       ap_bucket *b;
  @@ -2805,7 +2805,7 @@
       return c;
   }
   
  -API_EXPORT(int) ap_rputs(const char *str, request_rec *r)
  +AP_DECLARE(int) ap_rputs(const char *str, request_rec *r)
   {
       ap_bucket_brigade *bb = NULL;
       ap_bucket *b;
  @@ -2825,7 +2825,7 @@
       return len;
   }
   
  -API_EXPORT(int) ap_rwrite(const void *buf, int nbyte, request_rec *r)
  +AP_DECLARE(int) ap_rwrite(const void *buf, int nbyte, request_rec *r)
   {
       ap_bucket_brigade *bb = NULL;
       ap_bucket *b;
  @@ -2842,7 +2842,7 @@
       return nbyte;
   }
   
  -API_EXPORT(int) ap_vrprintf(request_rec *r, const char *fmt, va_list va)
  +AP_DECLARE(int) ap_vrprintf(request_rec *r, const char *fmt, va_list va)
   {
       ap_bucket_brigade *bb = NULL;
       apr_ssize_t written;
  @@ -2860,7 +2860,7 @@
   /* TODO:  Make ap pa_bucket_vprintf that printfs directly into a
    * bucket.
    */
  -API_EXPORT_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt, ...)
  +AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt, ...)
   {
       va_list va;
       int n;
  @@ -2875,7 +2875,7 @@
       return n;
   }
   
  -API_EXPORT_NONSTD(int) ap_rvputs(request_rec *r, ...)
  +AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r, ...)
   {
       ap_bucket_brigade *bb = NULL;
       apr_ssize_t written;
  @@ -2892,7 +2892,7 @@
       return written;
   }
   
  -API_EXPORT(int) ap_rflush(request_rec *r)
  +AP_DECLARE(int) ap_rflush(request_rec *r)
   {
       /* ### this is probably incorrect, but we have no mechanism for telling
          ### the filter chain to flush any content they may be holding.
  @@ -3152,7 +3152,7 @@
    * and 5xx (server error) messages that have not been redirected to another
    * handler via the ErrorDocument feature.
    */
  -API_EXPORT(void) ap_send_error_response(request_rec *r, int recursive_error)
  +AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error)
   {
       int status = r->status;
       int idx = ap_index_of_response(status);
  
  
  
  1.58      +12 -12    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.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- http_request.c	2000/10/13 16:57:13	1.57
  +++ http_request.c	2000/10/16 06:04:52	1.58
  @@ -817,7 +817,7 @@
       return rr;
   }
   
  -API_EXPORT(request_rec *) ap_sub_req_method_uri(const char *method,
  +AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
                                                   const char *new_file,
                                                   const request_rec *r)
   {
  @@ -908,13 +908,13 @@
       return rnew;
   }
   
  -API_EXPORT(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
  +AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
                                                   const request_rec *r)
   {
       return ap_sub_req_method_uri("GET", new_file, r);
   }
   
  -API_EXPORT(request_rec *) ap_sub_req_lookup_file(const char *new_file,
  +AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file,
                                                 const request_rec *r)
   {
       request_rec *rnew;
  @@ -1039,7 +1039,7 @@
       return rnew;
   }
   
  -API_EXPORT(int) ap_run_sub_req(request_rec *r)
  +AP_DECLARE(int) ap_run_sub_req(request_rec *r)
   {
       int retval;
   
  @@ -1050,7 +1050,7 @@
       return retval;
   }
   
  -API_EXPORT(void) ap_destroy_sub_req(request_rec *r)
  +AP_DECLARE(void) ap_destroy_sub_req(request_rec *r)
   {
       /* Reclaim the space */
       apr_destroy_pool(r->pool);
  @@ -1061,7 +1061,7 @@
    * Mainline request processing...
    */
   
  -API_EXPORT(void) ap_die(int type, request_rec *r)
  +AP_DECLARE(void) ap_die(int type, request_rec *r)
   {
       int error_index = ap_index_of_response(type);
       char *custom_response = ap_response_code_string(r, error_index);
  @@ -1176,7 +1176,7 @@
           ap_die(status, r);
   }
   
  -API_EXPORT(int) ap_some_auth_required(request_rec *r)
  +AP_DECLARE(int) ap_some_auth_required(request_rec *r)
   {
       /* Is there a require line configured for the type of *this* req? */
   
  @@ -1459,7 +1459,7 @@
       return new;
   }
   
  -API_EXPORT(void) ap_internal_redirect(const char *new_uri, request_rec *r)
  +AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r)
   {
       request_rec *new = internal_internal_redirect(new_uri, r);
       process_request_internal(new);
  @@ -1469,7 +1469,7 @@
    * using AddHandler, and you want to preserve the content type across
    * an internal redirect.
    */
  -API_EXPORT(void) ap_internal_redirect_handler(const char *new_uri, request_rec *r)
  +AP_DECLARE(void) ap_internal_redirect_handler(const char *new_uri, request_rec *r)
   {
       request_rec *new = internal_internal_redirect(new_uri, r);
       if (r->handler)
  @@ -1480,7 +1480,7 @@
   /*
    * Is it the initial main request, which we only get *once* per HTTP request?
    */
  -API_EXPORT(int) ap_is_initial_req(request_rec *r)
  +AP_DECLARE(int) ap_is_initial_req(request_rec *r)
   {
       return
           (r->main == NULL)       /* otherwise, this is a sub-request */
  @@ -1492,14 +1492,14 @@
    * Function to set the r->mtime field to the specified value if it's later
    * than what's already there.
    */
  -API_EXPORT(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime)
  +AP_DECLARE(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime)
   {
       if (r->mtime < dependency_mtime) {
   	r->mtime = dependency_mtime;
       }
   }
   
  -API_EXPORT(void) ap_allow_methods(request_rec *r, int reset, ...) 
  +AP_DECLARE(void) ap_allow_methods(request_rec *r, int reset, ...) 
   {
       const char *method;
       va_list methods;
  
  
  
  1.28      +1 -1      apache-2.0/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- http_vhost.c	2000/09/12 17:46:40	1.27
  +++ http_vhost.c	2000/10/16 06:04:52	1.28
  @@ -790,7 +790,7 @@
    * we just call it a match.  But here we require the host:port to match
    * the ServerName and/or ServerAliases.
    */
  -API_EXPORT(int) ap_matches_request_vhost(request_rec *r, const char *host,
  +AP_DECLARE(int) ap_matches_request_vhost(request_rec *r, const char *host,
       unsigned port)
   {
       server_rec *s;
  
  
  
  1.73      +57 -57    apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- util.c	2000/10/13 16:57:15	1.72
  +++ util.c	2000/10/16 06:04:53	1.73
  @@ -126,7 +126,7 @@
    * Examine a field value (such as a media-/content-type) string and return
    * it sans any parameters; e.g., strip off any ';charset=foo' and the like.
    */
  -API_EXPORT(char *) ap_field_noparam(apr_pool_t *p, const char *intype)
  +AP_DECLARE(char *) ap_field_noparam(apr_pool_t *p, const char *intype)
   {
       const char *semi;
   
  @@ -144,7 +144,7 @@
       }
   }
   
  -API_EXPORT(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int gmt)
  +AP_DECLARE(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int gmt)
   {
       apr_size_t retcode;
       char ts[MAX_STRING_LEN];
  @@ -209,7 +209,7 @@
    * Based loosely on sections of wildmat.c by Rich Salz
    * Hmmm... shouldn't this really go component by component?
    */
  -API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp)
  +AP_DECLARE(int) ap_strcmp_match(const char *str, const char *exp)
   {
       int x, y;
   
  @@ -233,7 +233,7 @@
       return (str[x] != '\0');
   }
   
  -API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp)
  +AP_DECLARE(int) ap_strcasecmp_match(const char *str, const char *exp)
   {
       int x, y;
   
  @@ -257,7 +257,7 @@
       return (str[x] != '\0');
   }
   
  -API_EXPORT(int) ap_is_matchexp(const char *str)
  +AP_DECLARE(int) ap_is_matchexp(const char *str)
   {
       register int x;
   
  @@ -281,7 +281,7 @@
       return APR_SUCCESS;
   }
   
  -API_EXPORT(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
  +AP_DECLARE(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
   				   int cflags)
   {
       regex_t *preg = apr_palloc(p, sizeof(regex_t));
  @@ -295,7 +295,7 @@
       return preg;
   }
   
  -API_EXPORT(void) ap_pregfree(apr_pool_t *p, regex_t * reg)
  +AP_DECLARE(void) ap_pregfree(apr_pool_t *p, regex_t * reg)
   {
       regfree(reg);
       apr_kill_cleanup(p, (void *) reg, regex_cleanup);
  @@ -305,7 +305,7 @@
    * Similar to standard strstr() but we ignore case in this version.
    * Based on the strstr() implementation further below.
    */
  -API_EXPORT(char *) ap_strcasestr(const char *s1, const char *s2)
  +AP_DECLARE(char *) ap_strcasestr(const char *s1, const char *s2)
   {
       char *p1, *p2;
       if (*s2 == '\0') {
  @@ -342,7 +342,7 @@
    * can use standard pointer comparisons in the calling function
    * (eg: test if ap_stripprefix(a,b) == a)
    */
  -API_EXPORT(char *) ap_stripprefix(const char *bigstring, const char *prefix)
  +AP_DECLARE(char *) ap_stripprefix(const char *bigstring, const char *prefix)
   {
       char *p1;
       if (*prefix == '\0') {
  @@ -365,13 +365,13 @@
    * This is especially important for the DSO situations of modules.
    * DO NOT MAKE A MACRO OUT OF THIS FUNCTION!
    */
  -API_EXPORT(int) ap_regexec(regex_t *preg, const char *string,
  +AP_DECLARE(int) ap_regexec(regex_t *preg, const char *string,
                              size_t nmatch, regmatch_t pmatch[], int eflags)
   {
       return regexec(preg, string, nmatch, pmatch, eflags);
   }
   
  -API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
  +AP_DECLARE(size_t) ap_regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
   {
       return regerror(errcode, preg, errbuf, errbuf_size);
   }
  @@ -391,7 +391,7 @@
    * AT&T V8 regexp package.
    */
   
  -API_EXPORT(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,
  +AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,
   			   size_t nmatch, regmatch_t pmatch[])
   {
       const char *src = input;
  @@ -462,7 +462,7 @@
   /*
    * Parse .. so we don't compromise security
    */
  -API_EXPORT(void) ap_getparents(char *name)
  +AP_DECLARE(void) ap_getparents(char *name)
   {
       int l, w;
   
  @@ -523,7 +523,7 @@
       }
   }
   
  -API_EXPORT(void) ap_no2slash(char *name)
  +AP_DECLARE(void) ap_no2slash(char *name)
   {
       char *d, *s;
   
  @@ -566,7 +566,7 @@
    *    /a/b, 3  ==> /a/b/
    *    /a/b, 4  ==> /a/b/
    */
  -API_EXPORT(char *) ap_make_dirstr_prefix(char *d, const char *s, int n)
  +AP_DECLARE(char *) ap_make_dirstr_prefix(char *d, const char *s, int n)
   {
   #if defined(HAVE_DRIVE_LETTERS) || defined(NETWARE)
       if (!n) {
  @@ -591,7 +591,7 @@
   /*
    * return the parent directory name including trailing / of the file s
    */
  -API_EXPORT(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s)
  +AP_DECLARE(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s)
   {
       const char *last_slash = ap_strrchr_c(s, '/');
       char *d;
  @@ -609,7 +609,7 @@
   }
   
   
  -API_EXPORT(int) ap_count_dirs(const char *path)
  +AP_DECLARE(int) ap_count_dirs(const char *path)
   {
       register int x, n;
   
  @@ -620,7 +620,7 @@
   }
   
   
  -API_EXPORT(void) ap_chdir_file(const char *file)
  +AP_DECLARE(void) ap_chdir_file(const char *file)
   {
       const char *x;
       char buf[HUGE_STRING_LEN];
  @@ -638,12 +638,12 @@
        * error... ah well. */
   }
   
  -API_EXPORT(char *) ap_getword_nc(apr_pool_t *atrans, char **line, char stop)
  +AP_DECLARE(char *) ap_getword_nc(apr_pool_t *atrans, char **line, char stop)
   {
       return ap_getword(atrans, (const char **) line, stop);
   }
   
  -API_EXPORT(char *) ap_getword(apr_pool_t *atrans, const char **line, char stop)
  +AP_DECLARE(char *) ap_getword(apr_pool_t *atrans, const char **line, char stop)
   {
       const char *pos = ap_strchr_c(*line, stop);
       char *res;
  @@ -665,12 +665,12 @@
       return res;
   }
   
  -API_EXPORT(char *) ap_getword_white_nc(apr_pool_t *atrans, char **line)
  +AP_DECLARE(char *) ap_getword_white_nc(apr_pool_t *atrans, char **line)
   {
       return ap_getword_white(atrans, (const char **) line);
   }
   
  -API_EXPORT(char *) ap_getword_white(apr_pool_t *atrans, const char **line)
  +AP_DECLARE(char *) ap_getword_white(apr_pool_t *atrans, const char **line)
   {
       int pos = -1, x;
       char *res;
  @@ -699,12 +699,12 @@
       return res;
   }
   
  -API_EXPORT(char *) ap_getword_nulls_nc(apr_pool_t *atrans, char **line, char stop)
  +AP_DECLARE(char *) ap_getword_nulls_nc(apr_pool_t *atrans, char **line, char stop)
   {
       return ap_getword_nulls(atrans, (const char **) line, stop);
   }
   
  -API_EXPORT(char *) ap_getword_nulls(apr_pool_t *atrans, const char **line, char stop)
  +AP_DECLARE(char *) ap_getword_nulls(apr_pool_t *atrans, const char **line, char stop)
   {
       const char *pos = ap_strchr_c(*line, stop);
       char *res;
  @@ -750,12 +750,12 @@
   #endif
   }
   
  -API_EXPORT(char *) ap_getword_conf_nc(apr_pool_t *p, char **line)
  +AP_DECLARE(char *) ap_getword_conf_nc(apr_pool_t *p, char **line)
   {
       return ap_getword_conf(p, (const char **) line);
   }
   
  -API_EXPORT(char *) ap_getword_conf(apr_pool_t *p, const char **line)
  +AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p, const char **line)
   {
       const char *str = *line, *strend;
       char *res;
  @@ -802,7 +802,7 @@
    * environment value does not exist, leave the ${ENV}
    * construct alone; it means something else.
    */
  -API_EXPORT(const char *) ap_resolve_env(apr_pool_t *p, const char * word)
  +AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word)
   {
          char tmp[ MAX_STRING_LEN ];
          const char *s, *e;
  @@ -835,7 +835,7 @@
   
          return apr_pstrdup(p,tmp);
   }
  -API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp)
  +AP_DECLARE(int) ap_cfg_closefile(configfile_t *cfp)
   {
   #ifdef DEBUG
       ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL, 
  @@ -868,7 +868,7 @@
   }
   
   /* Open a configfile_t as FILE, return open configfile_t struct pointer */
  -API_EXPORT(apr_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name)
  +AP_DECLARE(apr_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name)
   {
       configfile_t *new_cfg;
       apr_file_t *file = NULL;
  @@ -933,7 +933,7 @@
   
   
   /* Allocate a configfile_t handle with user defined functions and params */
  -API_EXPORT(configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *descr,
  +AP_DECLARE(configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *descr,
       void *param,
       int(*getch)(void *param),
       void *(*getstr) (void *buf, size_t bufsiz, void *param),
  @@ -954,7 +954,7 @@
   
   
   /* Read one character from a configfile_t */
  -API_EXPORT(int) ap_cfg_getc(configfile_t *cfp)
  +AP_DECLARE(int) ap_cfg_getc(configfile_t *cfp)
   {
       register int ch = cfp->getch(cfp->param);
       if (ch == LF) 
  @@ -965,7 +965,7 @@
   
   /* Read one line from open configfile_t, strip LF, increase line number */
   /* If custom handler does not define a getstr() function, read char by char */
  -API_EXPORT(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp)
  +AP_DECLARE(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp)
   {
       /* If a "get string" function is defined, use it */
       if (cfp->getstr != NULL) {
  @@ -1104,7 +1104,7 @@
    * of field is shifted to the next non-comma, non-whitespace character.
    * len is the length of the item excluding any beginning whitespace.
    */
  -API_EXPORT(const char *) ap_size_list_item(const char **field, int *len)
  +AP_DECLARE(const char *) ap_size_list_item(const char **field, int *len)
   {
       const unsigned char *ptr = (const unsigned char *)*field;
       const unsigned char *token;
  @@ -1164,7 +1164,7 @@
    * the converted list item (or NULL if none) and the address pointed to by
    * field is shifted to the next non-comma, non-whitespace.
    */
  -API_EXPORT(char *) ap_get_list_item(apr_pool_t *p, const char **field)
  +AP_DECLARE(char *) ap_get_list_item(apr_pool_t *p, const char **field)
   {
       const char *tok_start;
       const unsigned char *ptr;
  @@ -1253,7 +1253,7 @@
    * This would be much more efficient if we stored header fields as
    * an array of list items as they are received instead of a plain string.
    */
  -API_EXPORT(int) ap_find_list_item(apr_pool_t *p, const char *line, const char *tok)
  +AP_DECLARE(int) ap_find_list_item(apr_pool_t *p, const char *line, const char *tok)
   {
       const unsigned char *pos;
       const unsigned char *ptr = (const unsigned char *)line;
  @@ -1356,7 +1356,7 @@
    * by whitespace at the caller's option.
    */
   
  -API_EXPORT(char *) ap_get_token(apr_pool_t *p, const char **accept_line, int accept_white)
  +AP_DECLARE(char *) ap_get_token(apr_pool_t *p, const char **accept_line, int accept_white)
   {
       const char *ptr = *accept_line;
       const char *tok_start;
  @@ -1396,7 +1396,7 @@
   
   
   /* find http tokens, see the definition of token from RFC2068 */
  -API_EXPORT(int) ap_find_token(apr_pool_t *p, const char *line, const char *tok)
  +AP_DECLARE(int) ap_find_token(apr_pool_t *p, const char *line, const char *tok)
   {
       const unsigned char *start_token;
       const unsigned char *s;
  @@ -1430,7 +1430,7 @@
   }
   
   
  -API_EXPORT(int) ap_find_last_token(apr_pool_t *p, const char *line, const char *tok)
  +AP_DECLARE(int) ap_find_last_token(apr_pool_t *p, const char *line, const char *tok)
   {
       int llen, tlen, lidx;
   
  @@ -1448,7 +1448,7 @@
       return (strncasecmp(&line[lidx], tok, tlen) == 0);
   }
   
  -API_EXPORT(char *) ap_escape_shell_cmd(apr_pool_t *p, const char *str)
  +AP_DECLARE(char *) ap_escape_shell_cmd(apr_pool_t *p, const char *str)
   {
       char *cmd;
       unsigned char *d;
  @@ -1508,7 +1508,7 @@
    *   decoding %2f -> /   (a special character)
    *                      returns HTTP_NOT_FOUND
    */
  -API_EXPORT(int) ap_unescape_url(char *url)
  +AP_DECLARE(int) ap_unescape_url(char *url)
   {
       register int badesc, badpath;
       char *x, *y;
  @@ -1546,7 +1546,7 @@
   	return OK;
   }
   
  -API_EXPORT(char *) ap_construct_server(apr_pool_t *p, const char *hostname,
  +AP_DECLARE(char *) ap_construct_server(apr_pool_t *p, const char *hostname,
   				    unsigned port, const request_rec *r)
   {
       if (ap_is_default_port(port, r))
  @@ -1594,7 +1594,7 @@
    * something with a '/' in it (and thus does not prefix "./").
    */
   
  -API_EXPORT(char *) ap_escape_path_segment(apr_pool_t *p, const char *segment)
  +AP_DECLARE(char *) ap_escape_path_segment(apr_pool_t *p, const char *segment)
   {
       char *copy = apr_palloc(p, 3 * strlen(segment) + 1);
       const unsigned char *s = (const unsigned char *)segment;
  @@ -1614,7 +1614,7 @@
       return copy;
   }
   
  -API_EXPORT(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partial)
  +AP_DECLARE(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partial)
   {
       char *copy = apr_palloc(p, 3 * strlen(path) + 3);
       const unsigned char *s = (const unsigned char *)path;
  @@ -1645,7 +1645,7 @@
   
   /* ap_escape_uri is now a macro for os_escape_path */
   
  -API_EXPORT(char *) ap_escape_html(apr_pool_t *p, const char *s)
  +AP_DECLARE(char *) ap_escape_html(apr_pool_t *p, const char *s)
   {
       int i, j;
       char *x;
  @@ -1681,7 +1681,7 @@
       return x;
   }
   
  -API_EXPORT(int) ap_is_directory(const char *path)
  +AP_DECLARE(int) ap_is_directory(const char *path)
   {
       apr_finfo_t finfo;
   
  @@ -1691,7 +1691,7 @@
       return (finfo.filetype == APR_DIR);
   }
   
  -API_EXPORT(int) ap_is_rdirectory(const char *path)
  +AP_DECLARE(int) ap_is_rdirectory(const char *path)
   {
       apr_finfo_t finfo;
   
  @@ -1701,7 +1701,7 @@
       return (finfo.filetype == APR_DIR);
   }
   
  -API_EXPORT(char *) ap_make_full_path(apr_pool_t *a, const char *src1,
  +AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *src1,
   				  const char *src2)
   {
       register int x;
  @@ -1719,7 +1719,7 @@
   /*
    * Check for an absoluteURI syntax (see section 3.2 in RFC2068).
    */
  -API_EXPORT(int) ap_is_url(const char *u)
  +AP_DECLARE(int) ap_is_url(const char *u)
   {
       register int x;
   
  @@ -1765,7 +1765,7 @@
   }
   #endif /* def NEED_INITGROUPS */
   
  -API_EXPORT(int) ap_ind(const char *s, char c)
  +AP_DECLARE(int) ap_ind(const char *s, char c)
   {
       register int x;
   
  @@ -1776,7 +1776,7 @@
       return -1;
   }
   
  -API_EXPORT(int) ap_rind(const char *s, char c)
  +AP_DECLARE(int) ap_rind(const char *s, char c)
   {
       register int x;
   
  @@ -1787,7 +1787,7 @@
       return -1;
   }
   
  -API_EXPORT(void) ap_str_tolower(char *str)
  +AP_DECLARE(void) ap_str_tolower(char *str)
   {
       while (*str) {
   	*str = apr_tolower(*str);
  @@ -1795,7 +1795,7 @@
       }
   }
   
  -API_EXPORT(uid_t) ap_uname2id(const char *name)
  +AP_DECLARE(uid_t) ap_uname2id(const char *name)
   {
   #ifdef WIN32
       return (1);
  @@ -1813,7 +1813,7 @@
   #endif
   }
   
  -API_EXPORT(gid_t) ap_gname2id(const char *name)
  +AP_DECLARE(gid_t) ap_gname2id(const char *name)
   {
   #ifdef WIN32
       return (1);
  @@ -1950,7 +1950,7 @@
   
   /* simple 'pool' alloc()ing glue to ap_base64.c
    */
  -API_EXPORT(char *) ap_pbase64decode(apr_pool_t *p, const char *bufcoded)
  +AP_DECLARE(char *) ap_pbase64decode(apr_pool_t *p, const char *bufcoded)
   {
       char *decoded;
       int l;
  @@ -1962,7 +1962,7 @@
       return decoded;
   }
   
  -API_EXPORT(char *) ap_pbase64encode(apr_pool_t *p, char *string) 
  +AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string) 
   { 
       char *encoded;
       int l = strlen(string);
  @@ -1981,7 +1981,7 @@
    * also need to compress spaces and such to be able to compare
    * properly. -djg
    */
  -API_EXPORT(void) ap_content_type_tolower(char *str)
  +AP_DECLARE(void) ap_content_type_tolower(char *str)
   {
       char *semi;
   
  @@ -2001,7 +2001,7 @@
   /*
    * Given a string, replace any bare " with \" .
    */
  -API_EXPORT(char *) ap_escape_quotes (apr_pool_t *p, const char *instring)
  +AP_DECLARE(char *) ap_escape_quotes (apr_pool_t *p, const char *instring)
   {
       int newlen = 0;
       const char *inchr = instring;
  
  
  
  1.6       +1 -1      apache-2.0/src/main/util_charset.c
  
  Index: util_charset.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_charset.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- util_charset.c	2000/10/05 11:21:21	1.5
  +++ util_charset.c	2000/10/16 06:04:53	1.6
  @@ -96,7 +96,7 @@
   
   apr_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii;
   
  -API_EXPORT(apr_status_t) ap_set_content_xlate(request_rec *r, int output, 
  +AP_DECLARE(apr_status_t) ap_set_content_xlate(request_rec *r, int output, 
                                                apr_xlate_t *xlate)
   {
       apr_status_t rv;
  
  
  
  1.16      +2 -2      apache-2.0/src/main/util_date.c
  
  Index: util_date.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_date.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- util_date.c	2000/08/06 06:07:35	1.15
  +++ util_date.c	2000/10/16 06:04:53	1.16
  @@ -89,7 +89,7 @@
    *   * - swallow remaining characters 
    *  <x> - exact match for any other character
    */
  -API_EXPORT(int) ap_checkmask(const char *data, const char *mask)
  +AP_DECLARE(int) ap_checkmask(const char *data, const char *mask)
   {
       int i;
       char d;
  @@ -180,7 +180,7 @@
    * but many changes since then.
    *
    */
  -API_EXPORT(apr_time_t) ap_parseHTTPdate(const char *date)
  +AP_DECLARE(apr_time_t) ap_parseHTTPdate(const char *date)
   {
       apr_exploded_time_t ds;
       apr_time_t result;
  
  
  
  1.32      +7 -7      apache-2.0/src/main/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_filter.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- util_filter.c	2000/10/15 18:15:11	1.31
  +++ util_filter.c	2000/10/16 06:04:53	1.32
  @@ -102,7 +102,7 @@
       apr_register_cleanup(FILTER_POOL, NULL, filter_cleanup, apr_null_cleanup);
   }
   
  -API_EXPORT(void) ap_register_input_filter(const char *name,
  +AP_DECLARE(void) ap_register_input_filter(const char *name,
                                             ap_in_filter_func filter_func,
                                             ap_filter_type ftype)
   {
  @@ -112,7 +112,7 @@
                       &registered_input_filters);
   }                                                                    
   
  -API_EXPORT(void) ap_register_output_filter(const char *name,
  +AP_DECLARE(void) ap_register_output_filter(const char *name,
                                              ap_out_filter_func filter_func,
                                              ap_filter_type ftype)
   {
  @@ -122,7 +122,7 @@
                       &registered_output_filters);
   }
   
  -API_EXPORT(void) ap_add_input_filter(const char *name, void *ctx, 
  +AP_DECLARE(void) ap_add_input_filter(const char *name, void *ctx, 
                                        request_rec *r, conn_rec *c)
   {
       ap_filter_rec_t *frec = registered_input_filters;
  @@ -155,7 +155,7 @@
       }
   }
   
  -API_EXPORT(void) ap_add_output_filter(const char *name, void *ctx, 
  +AP_DECLARE(void) ap_add_output_filter(const char *name, void *ctx, 
                                         request_rec *r, conn_rec *c)
   {
       ap_filter_rec_t *frec = registered_output_filters;
  @@ -195,7 +195,7 @@
    * save data off to the side should probably create their own temporary
    * brigade especially for that use.
    */
  -API_EXPORT(apr_status_t) ap_get_brigade(ap_filter_t *next, 
  +AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *next, 
                                         ap_bucket_brigade *bb, apr_ssize_t length)
   {
       if (next) {
  @@ -209,7 +209,7 @@
    * the current filter.  At that point, we can just call the first filter in
    * the stack, or r->output_filters.
    */
  -API_EXPORT(apr_status_t) ap_pass_brigade(ap_filter_t *next, ap_bucket_brigade *bb)
  +AP_DECLARE(apr_status_t) ap_pass_brigade(ap_filter_t *next, ap_bucket_brigade *bb)
   {
       if (next) {
           ap_bucket *e;
  @@ -221,7 +221,7 @@
       return AP_NOBODY_WROTE;
   }
   
  -API_EXPORT(void) ap_save_brigade(ap_filter_t *f, ap_bucket_brigade **saveto,
  +AP_DECLARE(void) ap_save_brigade(ap_filter_t *f, ap_bucket_brigade **saveto,
                                           ap_bucket_brigade **b)
   {
       ap_bucket *e;
  
  
  
  1.20      +5 -5      apache-2.0/src/main/util_md5.c
  
  Index: util_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- util_md5.c	2000/08/07 19:26:00	1.19
  +++ util_md5.c	2000/10/16 06:04:53	1.20
  @@ -92,7 +92,7 @@
   #include "util_md5.h"
   #include "util_ebcdic.h"
   
  -API_EXPORT(char *) ap_md5_binary(apr_pool_t *p, const unsigned char *buf, int length)
  +AP_DECLARE(char *) ap_md5_binary(apr_pool_t *p, const unsigned char *buf, int length)
   {
       const char *hex = "0123456789abcdef";
       apr_md5_ctx_t my_md5;
  @@ -120,7 +120,7 @@
       return apr_pstrdup(p, result);
   }
   
  -API_EXPORT(char *) ap_md5(apr_pool_t *p, const unsigned char *string)
  +AP_DECLARE(char *) ap_md5(apr_pool_t *p, const unsigned char *string)
   {
       return ap_md5_binary(p, string, (int) strlen((char *)string));
   }
  @@ -170,7 +170,7 @@
   static char basis_64[] =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   
  -API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *a, apr_md5_ctx_t *context)
  +AP_DECLARE(char *) ap_md5contextTo64(apr_pool_t *a, apr_md5_ctx_t *context)
   {
       unsigned char digest[18];
       char *encodedDigest;
  @@ -197,7 +197,7 @@
   
   #ifdef APACHE_XLATE
   
  -API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
  +AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
                                   apr_xlate_t *xlate)
   {
       apr_md5_ctx_t context;
  @@ -221,7 +221,7 @@
   
   #else
   
  -API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile)
  +AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile)
   {
       apr_md5_ctx_t context;
       unsigned char buf[1000];
  
  
  
  1.44      +8 -8      apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- util_script.c	2000/10/12 04:20:36	1.43
  +++ util_script.c	2000/10/16 06:04:53	1.44
  @@ -114,7 +114,7 @@
       return res;
   }
   
  -API_EXPORT(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t)
  +AP_DECLARE(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t)
   {
       apr_array_header_t *env_arr = apr_table_elts(t);
       apr_table_entry_t *elts = (apr_table_entry_t *) env_arr->elts;
  @@ -152,7 +152,7 @@
       return env;
   }
   
  -API_EXPORT(void) ap_add_common_vars(request_rec *r)
  +AP_DECLARE(void) ap_add_common_vars(request_rec *r)
   {
       apr_table_t *e;
       server_rec *s = r->server;
  @@ -289,7 +289,7 @@
    * and find as much of the two that match as possible.
    */
   
  -API_EXPORT(int) ap_find_path_info(const char *uri, const char *path_info)
  +AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info)
   {
       int lu = strlen(uri);
       int lp = strlen(path_info);
  @@ -334,7 +334,7 @@
       return apr_pstrndup(r->pool, first, last - first);
   }
   
  -API_EXPORT(void) ap_add_cgi_vars(request_rec *r)
  +AP_DECLARE(void) ap_add_cgi_vars(request_rec *r)
   {
       apr_table_t *e = r->subprocess_env;
   
  @@ -403,7 +403,7 @@
       return 1;
   }
   
  -API_EXPORT(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
  +AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
   				       int (*getsfunc) (char *, int, void *),
   				       void *getsfunc_data)
   {
  @@ -589,7 +589,7 @@
       return apr_fgets(buf, len, (apr_file_t *) f) == APR_SUCCESS;
   }
   
  -API_EXPORT(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f,
  +AP_DECLARE(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f,
   					  char *buffer)
   {
       return ap_scan_script_header_err_core(r, buffer, getsfunc_FILE, f);
  @@ -633,7 +633,7 @@
    * character is returned to **arg, **data.  (The first optional arg is
    * counted as 0.)
    */
  -API_EXPORT_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r, 
  +AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r, 
                                                         char *buffer, 
                                                         const char **termch,
                                                         int *termarg, ...)
  @@ -653,7 +653,7 @@
       return res;
   }
   
  -API_EXPORT(void) ap_send_size(apr_ssize_t size, request_rec *r)
  +AP_DECLARE(void) ap_send_size(apr_ssize_t size, request_rec *r)
   {
       /* XXX: this -1 thing is a gross hack */
       if (size == (apr_ssize_t)-1) {
  
  
  
  1.19      +10 -10    apache-2.0/src/main/util_uri.c
  
  Index: util_uri.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_uri.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- util_uri.c	2000/08/02 05:26:49	1.18
  +++ util_uri.c	2000/10/16 06:04:53	1.19
  @@ -94,7 +94,7 @@
   };
   
   
  -API_EXPORT(unsigned short) ap_default_port_for_scheme(const char *scheme_str)
  +AP_DECLARE(unsigned short) ap_default_port_for_scheme(const char *scheme_str)
   {
       schemes_t *scheme;
   
  @@ -105,7 +105,7 @@
       return 0;
   }
   
  -API_EXPORT(unsigned short) ap_default_port_for_request(const request_rec *r)
  +AP_DECLARE(unsigned short) ap_default_port_for_request(const request_rec *r)
   {
       return (r->parsed_uri.scheme)
   	? ap_default_port_for_scheme(r->parsed_uri.scheme)
  @@ -116,7 +116,7 @@
    * from a call to gethostbyname() and lives in static storage.
    * By creating a copy we can tuck it away for later use.
    */
  -API_EXPORT(struct hostent *) ap_pduphostent(apr_pool_t *p, const struct hostent *hp)
  +AP_DECLARE(struct hostent *) ap_pduphostent(apr_pool_t *p, const struct hostent *hp)
   {
       struct hostent *newent;
       char	  **ptrs;
  @@ -169,7 +169,7 @@
    * COPY OF the hostent structure, intended to be stored and used later.
    * (gethostbyname() uses static storage that would be overwritten on each call)
    */
  -API_EXPORT(struct hostent *) ap_pgethostbyname(apr_pool_t *p, const char *hostname)
  +AP_DECLARE(struct hostent *) ap_pgethostbyname(apr_pool_t *p, const char *hostname)
   {
       struct hostent *hp = gethostbyname(hostname);
       return (hp == NULL) ? NULL : ap_pduphostent(p, hp);
  @@ -179,7 +179,7 @@
   /* Unparse a uri_components structure to an URI string.
    * Optionally suppress the password for security reasons.
    */
  -API_EXPORT(char *) ap_unparse_uri_components(apr_pool_t *p, const uri_components *uptr, unsigned flags)
  +AP_DECLARE(char *) ap_unparse_uri_components(apr_pool_t *p, const uri_components *uptr, unsigned flags)
   {
       char *ret = "";
   
  @@ -242,7 +242,7 @@
   static regex_t re_uri;
   static regex_t re_hostpart;
   
  -API_EXPORT(void) ap_util_uri_init(void)
  +AP_DECLARE(void) ap_util_uri_init(void)
   {
       int ret;
       const char *re_str;
  @@ -311,7 +311,7 @@
    *  - fills in fields of uri_components *uptr
    *  - none on any of the r->* fields
    */
  -API_EXPORT(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr)
  +AP_DECLARE(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr)
   {
       int ret;
       regmatch_t match[10];	/* This must have at least as much elements
  @@ -440,7 +440,7 @@
   #define NOTEND_HOSTINFO	(T_SLASH | T_QUESTION | T_HASH | T_NUL)
   #define NOTEND_PATH	(T_QUESTION | T_HASH | T_NUL)
   
  -API_EXPORT(void) ap_util_uri_init(void)
  +AP_DECLARE(void) ap_util_uri_init(void)
   {
       /* nothing to do */
   }
  @@ -453,7 +453,7 @@
    *  - fills in fields of uri_components *uptr
    *  - none on any of the r->* fields
    */
  -API_EXPORT(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr)
  +AP_DECLARE(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr)
   {
       const char *s;
       const char *s1;
  @@ -577,7 +577,7 @@
    * currently at http://www.mcom.com/newsref/std/tunneling_ssl.html
    * for the format of the "CONNECT host:port HTTP/1.0" request
    */
  -API_EXPORT(int) ap_parse_hostinfo_components(apr_pool_t *p, const char *hostinfo, uri_components *uptr)
  +AP_DECLARE(int) ap_parse_hostinfo_components(apr_pool_t *p, const char *hostinfo, uri_components *uptr)
   {
       const char *s;
       char *endstr;
  
  
  
  1.10      +7 -7      apache-2.0/src/main/util_xml.c
  
  Index: util_xml.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_xml.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- util_xml.c	2000/08/02 05:26:50	1.9
  +++ util_xml.c	2000/10/16 06:04:53	1.10
  @@ -358,7 +358,7 @@
       ap_text_append(ctx->p, hdr, s);
   }
   
  -API_EXPORT(int) ap_xml_parse_input(request_rec * r, ap_xml_doc **pdoc)
  +AP_DECLARE(int) ap_xml_parse_input(request_rec * r, ap_xml_doc **pdoc)
   {
       int result;
       ap_xml_ctx ctx =
  @@ -474,7 +474,7 @@
       return HTTP_BAD_REQUEST;
   }
   
  -API_EXPORT(void) ap_text_append(apr_pool_t * p, ap_text_header *hdr,
  +AP_DECLARE(void) ap_text_append(apr_pool_t * p, ap_text_header *hdr,
                                   const char *text)
   {
       ap_text *t = apr_palloc(p, sizeof(*t));
  @@ -508,7 +508,7 @@
   ** quotes is typically set to true for XML strings that will occur within
   ** double quotes -- attribute values.
   */
  -API_EXPORT(const char *) ap_xml_quote_string(apr_pool_t *p, const char *s,
  +AP_DECLARE(const char *) ap_xml_quote_string(apr_pool_t *p, const char *s,
                                                int quotes)
   {
       const char *scan;
  @@ -781,7 +781,7 @@
       return s;
   }
   
  -API_EXPORT(void) ap_xml_quote_elem(apr_pool_t *p, ap_xml_elem *elem)
  +AP_DECLARE(void) ap_xml_quote_elem(apr_pool_t *p, ap_xml_elem *elem)
   {
       ap_text *scan_txt;
       ap_xml_attr *scan_attr;
  @@ -815,7 +815,7 @@
   }
   
   /* convert an element to a text string */
  -API_EXPORT(void) ap_xml_to_text(apr_pool_t * p, const ap_xml_elem *elem,
  +AP_DECLARE(void) ap_xml_to_text(apr_pool_t * p, const ap_xml_elem *elem,
                                   int style, apr_array_header_t *namespaces,
                                   int *ns_map, const char **pbuf, size_t *psize)
   {
  @@ -831,7 +831,7 @@
   	*psize = size;
   }
   
  -API_EXPORT(const char *) ap_xml_empty_elem(apr_pool_t * p,
  +AP_DECLARE(const char *) ap_xml_empty_elem(apr_pool_t * p,
                                              const ap_xml_elem *elem)
   {
       if (elem->ns == AP_XML_NS_NONE) {
  @@ -846,7 +846,7 @@
   }
   
   /* return the URI's (existing) index, or insert it and return a new index */
  -API_EXPORT(int) ap_xml_insert_uri(apr_array_header_t *uri_array,
  +AP_DECLARE(int) ap_xml_insert_uri(apr_array_header_t *uri_array,
                                     const char *uri)
   {
       int i;
  
  
  
  1.22      +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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_mmap_static.c	2000/09/12 04:11:55	1.21
  +++ mod_mmap_static.c	2000/10/16 06:04:56	1.22
  @@ -130,7 +130,7 @@
   #include "apr_mmap.h"
   #include "apr_strings.h"
   
  -module MODULE_VAR_EXPORT mmap_static_module;
  +module AP_MODULE_DECLARE_DATA mmap_static_module;
   
   typedef struct {
       apr_mmap_t *mm;
  @@ -342,7 +342,7 @@
       { NULL }
   };
   
  -module MODULE_VAR_EXPORT mmap_static_module =
  +module AP_MODULE_DECLARE_DATA mmap_static_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                     /* create per-directory config structure */
  
  
  
  1.4       +1 -1      apache-2.0/src/modules/file_cache/mod_cache.c
  
  Index: mod_cache.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/file_cache/mod_cache.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_cache.c	2000/09/10 20:45:17	1.3
  +++ mod_cache.c	2000/10/16 06:04:56	1.4
  @@ -299,7 +299,7 @@
       ap_hook_cache_init(cache_init, NULL, NULL, AP_HOOK_FIRST);
   }
   
  -module MODULE_VAR_EXPORT cache_module =
  +module AP_MODULE_DECLARE_DATA cache_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,            /* create per-directory config structure */
  
  
  
  1.6       +1 -1      apache-2.0/src/modules/file_cache/mod_cache.h
  
  Index: mod_cache.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/file_cache/mod_cache.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_cache.h	2000/09/10 20:45:17	1.5
  +++ mod_cache.h	2000/10/16 06:04:56	1.6
  @@ -74,7 +74,7 @@
   
   #define TESTING 0
   
  -extern module MODULE_VAR_EXPORT cache_module;
  +extern module AP_MODULE_DECLARE_DATA cache_module;
   
   /* number of characters in the hash */
   #define HASH_LEN (22*2)
  
  
  
  1.23      +3 -3      apache-2.0/src/modules/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/beos.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- beos.c	2000/08/23 00:01:53	1.22
  +++ beos.c	2000/10/16 06:04:57	1.23
  @@ -97,7 +97,7 @@
   static int max_spare_threads=0;
   static int ap_thread_limit=0;
   static time_t ap_restart_time=0;
  -API_VAR_EXPORT int ap_extended_status = 0;
  +AP_DECLARE_DATA int ap_extended_status = 0;
   static int num_listening_sockets = 0; /* set by open_listeners in ap_mpm_run */
   static apr_socket_t ** listening_sockets;
   apr_lock_t *accept_mutex = NULL;
  @@ -140,7 +140,7 @@
   int raise_sigstop_flags;
   #endif
   
  -API_EXPORT(int) ap_get_max_daemons(void)
  +AP_DECLARE(int) ap_get_max_daemons(void)
   {
       return ap_max_child_assigned;
   }
  @@ -1069,7 +1069,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_beos_module = {
  +module AP_MODULE_DECLARE_DATA mpm_beos_module = {
       MPM20_MODULE_STUFF,
       NULL,                       /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.5       +1 -1      apache-2.0/src/modules/mpm/beos/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/scoreboard.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- scoreboard.c	2000/08/09 10:23:49	1.4
  +++ scoreboard.c	2000/10/16 06:04:57	1.5
  @@ -89,7 +89,7 @@
       ap_scoreboard_image = NULL;
   }
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void)
  +AP_DECLARE(int) ap_exists_scoreboard_image(void)
   {
       return (ap_scoreboard_image ? 1 : 0);
   }
  
  
  
  1.3       +2 -2      apache-2.0/src/modules/mpm/beos/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/scoreboard.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- scoreboard.h	2000/08/02 05:27:03	1.2
  +++ scoreboard.h	2000/10/16 06:04:57	1.3
  @@ -66,14 +66,14 @@
   #include <sys/times.h>
   #include "mpm_default.h"	/* For HARD_.*_LIMIT */
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void);
  +AP_DECLARE(int) ap_exists_scoreboard_image(void);
   void reinit_scoareboard(apr_pool_t *p);
   void cleanup_scoreboard(void);
   void ap_beos_set_maintain_connection_status(int flag);
   void ap_beos_force_reset_connection_status(long conn_id);
   void reinit_scoreboard(apr_pool_t *p);
   void update_scoreboard_global(void);
  -API_EXPORT(int) find_child_by_pid(int pid);
  +AP_DECLARE(int) find_child_by_pid(int pid);
   int ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);
   void ap_time_process_request(int child_num, int thread_num, int status);
   
  
  
  
  1.127     +3 -3      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.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- dexter.c	2000/10/05 17:33:03	1.126
  +++ dexter.c	2000/10/16 06:04:57	1.127
  @@ -99,7 +99,7 @@
   static int max_threads = 0;
   static int max_requests_per_child = 0;
   static const char *ap_pid_fname=NULL;
  -API_VAR_EXPORT const char *ap_scoreboard_fname=NULL;
  +AP_DECLARE_DATA const char *ap_scoreboard_fname=NULL;
   static int num_daemons=0;
   static int workers_may_exit = 0;
   static int requests_this_child;
  @@ -173,7 +173,7 @@
   static const char *lock_fname;
   static pthread_mutex_t thread_accept_mutex = PTHREAD_MUTEX_INITIALIZER;
   
  -API_EXPORT(int) ap_get_max_daemons(void)
  +AP_DECLARE(int) ap_get_max_daemons(void)
   {
       return ap_max_daemons_limit;
   }
  @@ -1397,7 +1397,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_dexter_module = {
  +module AP_MODULE_DECLARE_DATA mpm_dexter_module = {
       MPM20_MODULE_STUFF,
       NULL,                       /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.12      +2 -2      apache-2.0/src/modules/mpm/dexter/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- scoreboard.h	2000/08/02 05:27:04	1.11
  +++ scoreboard.h	2000/10/16 06:04:57	1.12
  @@ -74,7 +74,7 @@
   /* The generic shared memory chunk code */
   void reinit_scoreboard(apr_pool_t *p);
   
  -API_EXPORT(void) reopen_scoreboard(apr_pool_t *p);
  +AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);
   
   /* The stuff for Dexter's status table */
   
  @@ -98,7 +98,7 @@
   
   #define SCOREBOARD_SIZE		sizeof(scoreboard)
   
  -API_VAR_EXPORT extern const char *ap_scoreboard_fname;
  +AP_DECLARE_DATA extern const char *ap_scoreboard_fname;
   
   apr_status_t ap_cleanup_shared_mem(void *d);
   
  
  
  
  1.51      +3 -3      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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- mpmt_beos.c	2000/08/23 00:01:54	1.50
  +++ mpmt_beos.c	2000/10/16 06:04:58	1.51
  @@ -92,7 +92,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;
  +AP_DECLARE_DATA int ap_extended_status = 0;
   static int workers_may_exit = 0;
   static int requests_this_child;
   static int num_listenfds = 0;
  @@ -140,7 +140,7 @@
   int raise_sigstop_flags;
   #endif
   
  -API_EXPORT(int) ap_get_max_daemons(void)
  +AP_DECLARE(int) ap_get_max_daemons(void)
   {
       return ap_max_daemons_limit;
   }
  @@ -1055,7 +1055,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_mpmt_beos_module = {
  +module AP_MODULE_DECLARE_DATA mpm_mpmt_beos_module = {
       MPM20_MODULE_STUFF,
       NULL,                       /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.10      +1 -1      apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- scoreboard.c	2000/08/02 05:27:05	1.9
  +++ scoreboard.c	2000/10/16 06:04:58	1.10
  @@ -90,7 +90,7 @@
       ap_scoreboard_image = NULL;
   }
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void)
  +AP_DECLARE(int) ap_exists_scoreboard_image(void)
   {
       return (ap_scoreboard_image ? 1 : 0);
   }
  
  
  
  1.7       +2 -2      apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- scoreboard.h	2000/08/02 05:27:05	1.6
  +++ scoreboard.h	2000/10/16 06:04:58	1.7
  @@ -66,14 +66,14 @@
   #include <sys/times.h>
   #include "mpm_default.h"	/* For HARD_.*_LIMIT */
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void);
  +AP_DECLARE(int) ap_exists_scoreboard_image(void);
   void reinit_scoareboard(apr_pool_t *p);
   void cleanup_scoreboard(void);
   void ap_mpmt_beos_set_maintain_connection_status(int flag);
   void ap_mpmt_beos_force_reset_connection_status(long conn_id);
   void reinit_scoreboard(apr_pool_t *p);
   void update_scoreboard_global(void);
  -API_EXPORT(int) find_child_by_pid(int pid);
  +AP_DECLARE(int) find_child_by_pid(int pid);
   int ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);
   void ap_time_process_request(int child_num, int thread_num, int status);
   
  
  
  
  1.122     +4 -4      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.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- mpmt_pthread.c	2000/10/05 17:33:07	1.121
  +++ mpmt_pthread.c	2000/10/16 06:04:59	1.122
  @@ -94,13 +94,13 @@
   int ap_threads_per_child=0;         /* Worker threads per child */
   int ap_max_requests_per_child=0;
   static const char *ap_pid_fname=NULL;
  -API_VAR_EXPORT const char *ap_scoreboard_fname=NULL;
  +AP_DECLARE_DATA const 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;
  +AP_DECLARE_DATA int ap_extended_status = 0;
   static int workers_may_exit = 0;
   static int requests_this_child;
   static int num_listensocks = 0;
  @@ -168,7 +168,7 @@
   #define SAFE_ACCEPT(stmt) (stmt)
   #endif
   
  -API_EXPORT(int) ap_get_max_daemons(void)
  +AP_DECLARE(int) ap_get_max_daemons(void)
   {
       return ap_max_daemons_limit;
   }
  @@ -1411,7 +1411,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_mpmt_pthread_module = {
  +module AP_MODULE_DECLARE_DATA mpm_mpmt_pthread_module = {
       MPM20_MODULE_STUFF,
       NULL,                       /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.40      +2 -2      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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- scoreboard.c	2000/08/06 06:07:41	1.39
  +++ scoreboard.c	2000/10/16 06:04:59	1.40
  @@ -157,7 +157,7 @@
   {
   }
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void)
  +AP_DECLARE(int) ap_exists_scoreboard_image(void)
   {
       return (ap_scoreboard_image ? 1 : 0);
   }
  @@ -206,7 +206,7 @@
   
   }
   
  -API_EXPORT(int) find_child_by_pid(apr_proc_t *pid)
  +AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid)
   {
       int i;
       int max_daemons_limit = ap_get_max_daemons();
  
  
  
  1.23      +7 -7      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- scoreboard.h	2000/08/06 06:07:41	1.22
  +++ scoreboard.h	2000/10/16 06:04:59	1.23
  @@ -209,26 +209,26 @@
   #define SCOREBOARD_FRAMES		SCOREBOARD_SIZE/4095 + 1
   #endif
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void);
  +AP_DECLARE(int) ap_exists_scoreboard_image(void);
   void reinit_scoreboard(apr_pool_t *p);
   apr_status_t ap_cleanup_shared_mem(void *d);
  -API_EXPORT(void) ap_sync_scoreboard_image(void);
  +AP_DECLARE(void) ap_sync_scoreboard_image(void);
   void ap_mpmt_pthread_force_reset_connection_status(long conn_id);
   
  -API_EXPORT(void) reopen_scoreboard(apr_pool_t *p);
  +AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);
   
   apr_inline void ap_sync_scoreboard_image(void);
   void increment_counts(int child_num, int thread_num, request_rec *r);
   void update_scoreboard_global(void);
  -API_EXPORT(int) find_child_by_pid(apr_proc_t *pid);
  +AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid);
   int ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);
   void ap_time_process_request(int child_num, int thread_num, int status);
   
   
  -API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
  -API_VAR_EXPORT extern const char *ap_scoreboard_fname;
  +AP_DECLARE_DATA extern scoreboard *ap_scoreboard_image;
  +AP_DECLARE_DATA extern const char *ap_scoreboard_fname;
   
  -API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
  +AP_DECLARE_DATA extern ap_generation_t volatile ap_my_generation;
   
   /* for time_process_request() in http_main.c */
   #define START_PREQUEST 1
  
  
  
  1.22      +4 -4      apache-2.0/src/modules/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/perchild/perchild.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- perchild.c	2000/10/05 17:33:11	1.21
  +++ perchild.c	2000/10/16 06:05:00	1.22
  @@ -107,7 +107,7 @@
   static int max_threads = 0;
   static int max_requests_per_child = 0;
   static const char *ap_pid_fname=NULL;
  -API_VAR_EXPORT const char *ap_scoreboard_fname=NULL;
  +AP_DECLARE_DATA const char *ap_scoreboard_fname=NULL;
   static int num_daemons=0;
   static int curr_child_num=0;
   static int workers_may_exit = 0;
  @@ -153,7 +153,7 @@
   
   char ap_coredump_dir[MAX_STRING_LEN];
   
  -module MODULE_VAR_EXPORT mpm_perchild_module;
  +module AP_MODULE_DECLARE_DATA mpm_perchild_module;
   
   static apr_file_t *pipe_of_death_in = NULL;
   static apr_file_t *pipe_of_death_out = NULL;
  @@ -208,7 +208,7 @@
   static const char *lock_fname;
   static pthread_mutex_t thread_accept_mutex = PTHREAD_MUTEX_INITIALIZER;
   
  -API_EXPORT(int) ap_get_max_daemons(void)
  +AP_DECLARE(int) ap_get_max_daemons(void)
   {
       return ap_max_daemons_limit;
   }
  @@ -1754,7 +1754,7 @@
       return c;
   }
   
  -module MODULE_VAR_EXPORT mpm_perchild_module = {
  +module AP_MODULE_DECLARE_DATA mpm_perchild_module = {
       MPM20_MODULE_STUFF,
       NULL,                       /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.4       +2 -2      apache-2.0/src/modules/mpm/perchild/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/perchild/scoreboard.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- scoreboard.h	2000/08/02 05:27:07	1.3
  +++ scoreboard.h	2000/10/16 06:05:00	1.4
  @@ -74,7 +74,7 @@
   /* The generic shared memory chunk code */
   void reinit_scoreboard(apr_pool_t *p);
   
  -API_EXPORT(void) reopen_scoreboard(apr_pool_t *p);
  +AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);
   
   /* The stuff for perchild's status table */
   
  @@ -98,7 +98,7 @@
   
   #define SCOREBOARD_SIZE		sizeof(scoreboard)
   
  -API_VAR_EXPORT extern const char *ap_scoreboard_fname;
  +AP_DECLARE_DATA extern const char *ap_scoreboard_fname;
   apr_status_t ap_cleanup_shared_mem(void *d);
   
   #ifdef __cplusplus
  
  
  
  1.131     +4 -4      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.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- prefork.c	2000/10/06 18:28:27	1.130
  +++ prefork.c	2000/10/16 06:05:01	1.131
  @@ -190,7 +190,7 @@
   char tpf_server_name[INETD_SERVNAME_LENGTH+1];
   #endif /* TPF */
   
  -API_VAR_EXPORT scoreboard *ap_scoreboard_image = NULL;
  +AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL;
   static new_scoreboard *ap_new_scoreboard_image = NULL;
   
   #ifdef GPROF
  @@ -381,12 +381,12 @@
   #endif
   }
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void)
  +AP_DECLARE(int) ap_exists_scoreboard_image(void)
   {
       return (ap_scoreboard_image ? 1 : 0);
   }
   
  -API_EXPORT(int) ap_get_max_daemons(void)
  +AP_DECLARE(int) ap_get_max_daemons(void)
   {
       return ap_max_daemons_limit;
   }
  @@ -1855,7 +1855,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_prefork_module = {
  +module AP_MODULE_DECLARE_DATA mpm_prefork_module = {
       MPM20_MODULE_STUFF,
       NULL,                       /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.14      +4 -4      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- scoreboard.h	2000/08/02 05:27:09	1.13
  +++ scoreboard.h	2000/10/16 06:05:01	1.14
  @@ -206,12 +206,12 @@
   #define SCOREBOARD_FRAMES		SCOREBOARD_SIZE/4095 + 1
   #endif
   
  -API_EXPORT(void) ap_sync_scoreboard_image(void);
  -API_EXPORT(int) ap_exists_scoreboard_image(void);
  +AP_DECLARE(void) ap_sync_scoreboard_image(void);
  +AP_DECLARE(int) ap_exists_scoreboard_image(void);
   
  -API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
  +AP_DECLARE_DATA extern scoreboard *ap_scoreboard_image;
   
  -API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
  +AP_DECLARE_DATA extern ap_generation_t volatile ap_my_generation;
   
   /* for time_process_request() in http_main.c */
   #define START_PREQUEST 1
  
  
  
  1.13      +2 -2      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- scoreboard.h	2000/08/02 05:27:09	1.12
  +++ scoreboard.h	2000/10/16 06:05:01	1.13
  @@ -188,9 +188,9 @@
   #define SCOREBOARD_FRAMES		SCOREBOARD_SIZE/4095 + 1
   #endif
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void);
  +AP_DECLARE(int) ap_exists_scoreboard_image(void);
   
  -API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
  +AP_DECLARE_DATA extern scoreboard *ap_scoreboard_image;
   
   
   /* for time_process_request() in http_main.c */
  
  
  
  1.63      +6 -6      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.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- spmt_os2.c	2000/08/23 00:01:55	1.62
  +++ spmt_os2.c	2000/10/16 06:05:01	1.63
  @@ -234,12 +234,12 @@
   #define SAFE_ACCEPT(stmt) do {stmt;} while(0)
   #endif
   
  -API_EXPORT(int) ap_exists_scoreboard_image(void)
  +AP_DECLARE(int) ap_exists_scoreboard_image(void)
   {
       return (ap_scoreboard_image ? 1 : 0);
   }
   
  -API_EXPORT(int) ap_get_max_daemons(void)
  +AP_DECLARE(int) ap_get_max_daemons(void)
   {
       return max_daemons_limit;
   }
  @@ -685,7 +685,7 @@
    * Child process main loop.
    */
   
  -API_EXPORT(void) ap_child_terminate(request_rec *r)
  +AP_DECLARE(void) ap_child_terminate(request_rec *r)
   {
       r->connection->keepalive = 0;
       ap_scoreboard_image->parent[THREAD_GLOBAL(child_num)].deferred_die = 1;
  @@ -1541,13 +1541,13 @@
   
   /* Stub functions until this MPM supports the connection status API */
   
  -API_EXPORT(void) ap_update_connection_status(long conn_id, const char *key, \
  +AP_DECLARE(void) ap_update_connection_status(long conn_id, const char *key, \
                                                const char *value)
   {
       /* NOP */
   }
   
  -API_EXPORT(void) ap_reset_connection_status(long conn_id)
  +AP_DECLARE(void) ap_reset_connection_status(long conn_id)
   {
       /* NOP */
   }
  @@ -1571,7 +1571,7 @@
   { NULL }
   };
   
  -module MODULE_VAR_EXPORT mpm_spmt_os2_module = {
  +module AP_MODULE_DECLARE_DATA mpm_spmt_os2_module = {
       MPM20_MODULE_STUFF,
       NULL,                       /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.104     +8 -8      apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- mpm_winnt.c	2000/10/11 04:26:08	1.103
  +++ mpm_winnt.c	2000/10/16 06:05:02	1.104
  @@ -331,17 +331,17 @@
   
   static int volatile is_graceful = 0;
   
  -API_EXPORT(int) ap_graceful_stop_signalled(void)
  +AP_DECLARE(int) ap_graceful_stop_signalled(void)
   {
       return is_graceful;
   }
   
  -API_EXPORT(void) ap_start_shutdown(void)
  +AP_DECLARE(void) ap_start_shutdown(void)
   {
       signal_parent(0);
   }
   
  -API_EXPORT(void) ap_start_restart(int gracefully)
  +AP_DECLARE(void) ap_start_restart(int gracefully)
   {
       is_graceful = gracefully;
       signal_parent(1);
  @@ -2182,7 +2182,7 @@
       }
   }
   
  -API_EXPORT(int) ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s )
  +AP_DECLARE(int) ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s )
   {
       static int restart = 0;            /* Default is "not a restart" */
   
  @@ -2307,18 +2307,18 @@
   
   /* Stub functions until this MPM supports the connection status API */
   
  -API_EXPORT(void) ap_update_connection_status(long conn_id, const char *key, \
  +AP_DECLARE(void) ap_update_connection_status(long conn_id, const char *key, \
                                                const char *value)
   {
       /* NOP */
   }
   
  -API_EXPORT(void) ap_reset_connection_status(long conn_id)
  +AP_DECLARE(void) ap_reset_connection_status(long conn_id)
   {
       /* NOP */
   }
   
  -API_EXPORT(apr_array_header_t *) ap_get_status_table(apr_pool_t *p)
  +AP_DECLARE(apr_array_header_t *) ap_get_status_table(apr_pool_t *p)
   {
       /* NOP */
       return NULL;
  @@ -2337,7 +2337,7 @@
   { NULL }
   };
   
  -MODULE_VAR_EXPORT module mpm_winnt_module = {
  +AP_MODULE_DECLARE_DATA module mpm_winnt_module = {
       MPM20_MODULE_STUFF,
       winnt_rewrite_args,         /* hook to run before apache parses args */
       NULL,			/* create per-directory config structure */
  
  
  
  1.20      +2 -2      apache-2.0/src/modules/mpm/winnt/mpm_winnt.h
  
  Index: mpm_winnt.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mpm_winnt.h	2000/08/09 14:59:46	1.19
  +++ mpm_winnt.h	2000/10/16 06:05:02	1.20
  @@ -119,8 +119,8 @@
   extern int ap_extended_status;
   extern void clean_child_exit(int);
   
  -API_EXPORT(void) ap_start_shutdown(void);
  -API_EXPORT(void) ap_start_restart(int gracefully);
  +AP_DECLARE(void) ap_start_shutdown(void);
  +AP_DECLARE(void) ap_start_restart(int gracefully);
   
   void setup_signal_names(char *prefix);
   void signal_parent(int type);
  
  
  
  1.14      +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_proxy.c	2000/10/08 03:23:05	1.13
  +++ mod_proxy.c	2000/10/16 06:05:03	1.14
  @@ -801,7 +801,7 @@
       ap_hook_post_read_request(proxy_detect, NULL, NULL, AP_HOOK_FIRST);
   }
   
  -module MODULE_VAR_EXPORT proxy_module =
  +module AP_MODULE_DECLARE_DATA proxy_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                  /* create per-directory config structure */
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_proxy.h	2000/10/08 03:23:05	1.12
  +++ mod_proxy.h	2000/10/16 06:05:03	1.13
  @@ -129,7 +129,7 @@
   #include <arpa/inet.h>
   #endif
   
  -extern module MODULE_VAR_EXPORT proxy_module;
  +extern module AP_MODULE_DECLARE_DATA proxy_module;
   
   
   /* for proxy_canonenc() */
  
  
  
  1.20      +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_access.c	2000/08/06 06:07:46	1.19
  +++ mod_access.c	2000/10/16 06:05:03	1.20
  @@ -117,7 +117,7 @@
       apr_array_header_t *denys;
   } access_dir_conf;
   
  -module MODULE_VAR_EXPORT access_module;
  +module AP_MODULE_DECLARE_DATA access_module;
   
   static void *create_access_dir_config(apr_pool_t *p, char *dummy)
   {
  @@ -409,7 +409,7 @@
       ap_hook_access_checker(check_dir_access,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT access_module =
  +module AP_MODULE_DECLARE_DATA access_module =
   {
       STANDARD20_MODULE_STUFF,
       create_access_dir_config,	/* dir config creater */
  
  
  
  1.18      +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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_alias.c	2000/08/06 06:07:46	1.17
  +++ mod_alias.c	2000/10/16 06:05:03	1.18
  @@ -90,7 +90,7 @@
       apr_array_header_t *redirects;
   } alias_dir_conf;
   
  -module MODULE_VAR_EXPORT alias_module;
  +module AP_MODULE_DECLARE_DATA alias_module;
   
   static void *create_alias_config(apr_pool_t *p, server_rec *s)
   {
  @@ -423,7 +423,7 @@
       ap_hook_fixups(fixup_redir,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT alias_module =
  +module AP_MODULE_DECLARE_DATA alias_module =
   {
       STANDARD20_MODULE_STUFF,
       create_alias_dir_config,	/* dir config creater */
  
  
  
  1.26      +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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_asis.c	2000/08/02 05:27:14	1.25
  +++ mod_asis.c	2000/10/16 06:05:04	1.26
  @@ -128,7 +128,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT asis_module =
  +module AP_MODULE_DECLARE_DATA asis_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-directory config structure */
  
  
  
  1.24      +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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_auth.c	2000/08/02 05:27:14	1.23
  +++ mod_auth.c	2000/10/16 06:05:04	1.24
  @@ -121,7 +121,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT auth_module;
  +module AP_MODULE_DECLARE_DATA auth_module;
   
   static char *get_pw(request_rec *r, char *user, char *auth_pwfile)
   {
  @@ -324,7 +324,7 @@
       ap_hook_auth_checker(check_user_access,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT auth_module =
  +module AP_MODULE_DECLARE_DATA auth_module =
   {
       STANDARD20_MODULE_STUFF,
       create_auth_dir_config,	/* dir config creater */
  
  
  
  1.17      +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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_auth_anon.c	2000/08/02 05:27:14	1.16
  +++ mod_auth_anon.c	2000/10/16 06:05:04	1.17
  @@ -210,7 +210,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT auth_anon_module;
  +module AP_MODULE_DECLARE_DATA 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 AP_MODULE_DECLARE_DATA auth_anon_module =
   {
       STANDARD20_MODULE_STUFF,
       create_anon_auth_dir_config,/* dir config creater */
  
  
  
  1.19      +2 -2      apache-2.0/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_auth_dbm.c	2000/10/08 06:01:39	1.18
  +++ mod_auth_dbm.c	2000/10/16 06:05:04	1.19
  @@ -153,7 +153,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT auth_dbm_module;
  +module AP_MODULE_DECLARE_DATA auth_dbm_module;
   
   static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
   {
  @@ -333,7 +333,7 @@
       ap_hook_auth_checker(dbm_check_auth, NULL, NULL, AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT auth_dbm_module =
  +module AP_MODULE_DECLARE_DATA auth_dbm_module =
   {
       STANDARD20_MODULE_STUFF,
       create_dbm_auth_dir_config,	/* dir config creater */
  
  
  
  1.25      +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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_auth_digest.c	2000/08/06 06:07:46	1.24
  +++ mod_auth_digest.c	2000/10/16 06:05:04	1.25
  @@ -262,7 +262,7 @@
   static long num_buckets = DEF_NUM_BUCKETS;
   
   
  -module MODULE_VAR_EXPORT auth_digest_module;
  +module AP_MODULE_DECLARE_DATA auth_digest_module;
   
   /*
    * initialization code
  @@ -2061,7 +2061,7 @@
       ap_hook_fixups(add_auth_info, NULL, NULL, AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT auth_digest_module =
  +module AP_MODULE_DECLARE_DATA auth_digest_module =
   {
       STANDARD20_MODULE_STUFF,
       create_digest_dir_config,	/* dir config creater */
  
  
  
  1.43      +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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- mod_autoindex.c	2000/10/08 06:05:00	1.42
  +++ mod_autoindex.c	2000/10/16 06:05:04	1.43
  @@ -85,7 +85,7 @@
   #include <strings.h>
   #endif
   
  -module MODULE_VAR_EXPORT autoindex_module;
  +module AP_MODULE_DECLARE_DATA autoindex_module;
   
   /****************************************************************
    *
  @@ -1693,7 +1693,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT autoindex_module =
  +module AP_MODULE_DECLARE_DATA autoindex_module =
   {
       STANDARD20_MODULE_STUFF,
       create_autoindex_config,	/* dir config creater */
  
  
  
  1.23      +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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_cern_meta.c	2000/10/06 17:52:46	1.22
  +++ mod_cern_meta.c	2000/10/16 06:05:05	1.23
  @@ -167,7 +167,7 @@
   #define DEFAULT_METASUFFIX	".meta"
   #define DEFAULT_METAFILES	0
   
  -module MODULE_VAR_EXPORT cern_meta_module;
  +module AP_MODULE_DECLARE_DATA cern_meta_module;
   
   typedef struct {
       const char *metadir;
  @@ -386,7 +386,7 @@
   {
       ap_hook_fixups(add_cern_meta_data,NULL,NULL,AP_HOOK_MIDDLE);
   }
  -module MODULE_VAR_EXPORT cern_meta_module =
  +module AP_MODULE_DECLARE_DATA cern_meta_module =
   {
       STANDARD20_MODULE_STUFF,
       create_cern_meta_dir_config,/* dir config creater */
  
  
  
  1.66      +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.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- mod_cgi.c	2000/10/16 03:37:20	1.65
  +++ mod_cgi.c	2000/10/16 06:05:05	1.66
  @@ -91,7 +91,7 @@
   #include <strings.h>
   #endif
   
  -module MODULE_VAR_EXPORT cgi_module;
  +module AP_MODULE_DECLARE_DATA cgi_module;
   
   /* KLUDGE --- for back-combatibility, we don't have to check ExecCGI
    * in ScriptAliased directories, which means we need to know if this
  @@ -700,7 +700,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT cgi_module =
  +module AP_MODULE_DECLARE_DATA cgi_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* dir config creater */
  
  
  
  1.47      +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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mod_cgid.c	2000/10/13 03:38:35	1.46
  +++ mod_cgid.c	2000/10/16 06:05:05	1.47
  @@ -104,7 +104,7 @@
   #include <sys/un.h> /* for sockaddr_un */
   #include <sys/types.h>
   
  -module MODULE_VAR_EXPORT cgid_module; 
  +module AP_MODULE_DECLARE_DATA cgid_module; 
   
   static void cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *main_server); 
   static int once_through = 0; 
  @@ -1040,7 +1040,7 @@
       ap_hook_post_config(cgid_init, NULL, NULL, AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT cgid_module = { 
  +module AP_MODULE_DECLARE_DATA cgid_module = { 
       STANDARD20_MODULE_STUFF, 
       NULL, /* dir config creater */ 
       NULL, /* dir merger --- default is to override */ 
  
  
  
  1.20      +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_dir.c	2000/08/06 06:07:47	1.19
  +++ mod_dir.c	2000/10/16 06:05:05	1.20
  @@ -71,7 +71,7 @@
   #include "http_main.h"
   #include "util_script.h"
   
  -module MODULE_VAR_EXPORT dir_module;
  +module AP_MODULE_DECLARE_DATA dir_module;
   
   typedef struct dir_config_struct {
       apr_array_header_t *index_names;
  @@ -224,7 +224,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT dir_module = {
  +module AP_MODULE_DECLARE_DATA dir_module = {
       STANDARD20_MODULE_STUFF,
       create_dir_config,		/* create per-directory config structure */
       merge_dir_configs,		/* merge per-directory config structures */
  
  
  
  1.26      +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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_echo.c	2000/08/17 14:54:28	1.25
  +++ mod_echo.c	2000/10/16 06:05:05	1.26
  @@ -62,7 +62,7 @@
   #include "http_config.h"
   #include "http_connection.h"
   
  -API_VAR_EXPORT module echo_module;
  +AP_DECLARE_DATA module echo_module;
   
   typedef struct
       {
  @@ -122,7 +122,7 @@
       ap_hook_process_connection(process_echo_connection,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -API_VAR_EXPORT module echo_module = {
  +AP_DECLARE_DATA module echo_module = {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-directory config structure */
       NULL,			/* merge per-directory config structures */
  
  
  
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_env.c	2000/08/06 06:07:47	1.15
  +++ mod_env.c	2000/10/16 06:05:05	1.16
  @@ -114,7 +114,7 @@
       int vars_present;
   } env_dir_config_rec;
   
  -module MODULE_VAR_EXPORT env_module;
  +module AP_MODULE_DECLARE_DATA env_module;
   
   static void *create_env_dir_config(apr_pool_t *p, char *dummy)
   {
  @@ -260,7 +260,7 @@
   }
   
   
  -module MODULE_VAR_EXPORT env_module =
  +module AP_MODULE_DECLARE_DATA env_module =
   {
       STANDARD20_MODULE_STUFF,
       create_env_dir_config,      /* dir config creater */
  
  
  
  1.23      +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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_expires.c	2000/08/06 22:38:23	1.22
  +++ mod_expires.c	2000/10/16 06:05:05	1.23
  @@ -217,7 +217,7 @@
   #define ACTIVE_OFF      0
   #define ACTIVE_DONTCARE 2
   
  -module MODULE_VAR_EXPORT expires_module;
  +module AP_MODULE_DECLARE_DATA expires_module;
   
   static void *create_dir_expires_config(apr_pool_t *p, char *dummy)
   {
  @@ -505,7 +505,7 @@
       ap_hook_fixups(add_expires,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT expires_module =
  +module AP_MODULE_DECLARE_DATA expires_module =
   {
       STANDARD20_MODULE_STUFF,
       create_dir_expires_config,  /* dir config creater */
  
  
  
  1.28      +2 -2      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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_file_cache.c	2000/10/03 21:48:31	1.27
  +++ mod_file_cache.c	2000/10/16 06:05:06	1.28
  @@ -130,7 +130,7 @@
   #include "apr_mmap.h"
   #include "apr_strings.h"
   
  -module MODULE_VAR_EXPORT file_cache_module;
  +module AP_MODULE_DECLARE_DATA file_cache_module;
   static int once_through = 0;
   
   typedef struct {
  @@ -501,7 +501,7 @@
       { NULL }
   };
   
  -module MODULE_VAR_EXPORT file_cache_module =
  +module AP_MODULE_DECLARE_DATA file_cache_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                     /* create per-directory config structure */
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_headers.c	2000/08/02 05:27:15	1.12
  +++ mod_headers.c	2000/10/16 06:05:06	1.13
  @@ -128,7 +128,7 @@
       apr_array_header_t *headers;
   } headers_conf;
   
  -module MODULE_VAR_EXPORT headers_module;
  +module AP_MODULE_DECLARE_DATA headers_module;
   
   static void *create_headers_config(apr_pool_t *p, server_rec *s)
   {
  @@ -250,7 +250,7 @@
   {
       ap_hook_fixups(fixup_headers,NULL,NULL,AP_HOOK_MIDDLE);
   } 
  -module MODULE_VAR_EXPORT headers_module =
  +module AP_MODULE_DECLARE_DATA headers_module =
   {
       STANDARD20_MODULE_STUFF,
       create_headers_dir_config,  /* dir config creater */
  
  
  
  1.22      +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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_imap.c	2000/08/06 06:07:47	1.21
  +++ mod_imap.c	2000/10/16 06:05:06	1.22
  @@ -122,7 +122,7 @@
   double strtod();                /* SunOS needed this */
   #endif
   
  -module MODULE_VAR_EXPORT imap_module;
  +module AP_MODULE_DECLARE_DATA imap_module;
   
   typedef struct {
       char *imap_menu;
  @@ -909,7 +909,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT imap_module =
  +module AP_MODULE_DECLARE_DATA imap_module =
   {
       STANDARD20_MODULE_STUFF,
       create_imap_dir_config,     /* dir config creater */
  
  
  
  1.69      +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.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- mod_include.c	2000/10/16 03:43:44	1.68
  +++ mod_include.c	2000/10/16 06:05:06	1.69
  @@ -124,7 +124,7 @@
   #define RAW_ASCII_CHAR(ch)  (ch)
   #endif /*CHARSET_EBCDIC*/
   
  -module MODULE_VAR_EXPORT includes_module;
  +module AP_MODULE_DECLARE_DATA includes_module;
   
   /* just need some arbitrary non-NULL pointer which can't also be a request_rec */
   #define NESTED_INCLUDE_MAGIC	(&includes_module)
  @@ -2551,7 +2551,7 @@
       ap_register_output_filter("INCLUDES", includes_filter, AP_FTYPE_CONTENT);
   }
   
  -module MODULE_VAR_EXPORT includes_module =
  +module AP_MODULE_DECLARE_DATA includes_module =
   {
       STANDARD20_MODULE_STUFF,
       create_includes_dir_config, /* dir config creater */
  
  
  
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_info.c	2000/10/05 22:35:08	1.15
  +++ mod_info.c	2000/10/16 06:05:06	1.16
  @@ -112,7 +112,7 @@
       char *fname;
   } info_clines;
   
  -module MODULE_VAR_EXPORT info_module;
  +module AP_MODULE_DECLARE_DATA info_module;
   extern module *top_module;
   
   /* shamelessly lifted from http_config.c */
  @@ -733,7 +733,7 @@
       {NULL}
   };
   
  -module MODULE_VAR_EXPORT info_module =
  +module AP_MODULE_DECLARE_DATA info_module =
   {
       STANDARD_MODULE_STUFF,
       NULL,                       /* initializer */
  
  
  
  1.35      +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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- mod_log_config.c	2000/10/09 23:35:12	1.34
  +++ mod_log_config.c	2000/10/16 06:05:06	1.35
  @@ -187,7 +187,7 @@
   #include <strings.h>
   #endif
   
  -module MODULE_VAR_EXPORT config_log_module;
  +module AP_MODULE_DECLARE_DATA config_log_module;
   
   static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE);
   static apr_fileperms_t xfer_perms = APR_OS_DEFAULT;
  @@ -1166,7 +1166,7 @@
       ap_hook_log_transaction(multi_log_transaction,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT config_log_module =
  +module AP_MODULE_DECLARE_DATA config_log_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                       /* create per-dir config */
  
  
  
  1.28      +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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_mime.c	2000/10/09 03:05:38	1.27
  +++ mod_mime.c	2000/10/16 06:05:06	1.28
  @@ -131,7 +131,7 @@
       '\0'
   };
   
  -module MODULE_VAR_EXPORT mime_module;
  +module AP_MODULE_DECLARE_DATA mime_module;
   
   static void *create_mime_dir_config(apr_pool_t *p, char *dummy)
   {
  @@ -814,7 +814,7 @@
       ap_hook_post_config(mime_post_config,NULL,NULL,AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT mime_module = {
  +module AP_MODULE_DECLARE_DATA mime_module = {
       STANDARD20_MODULE_STUFF,
       create_mime_dir_config,	/* create per-directory config structure */
       merge_mime_dir_configs,	/* merge per-directory config structures */
  
  
  
  1.39      +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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_negotiation.c	2000/08/06 06:07:47	1.38
  +++ mod_negotiation.c	2000/10/16 06:05:06	1.39
  @@ -90,7 +90,7 @@
       apr_array_header_t *language_priority;
   } neg_dir_config;
   
  -module MODULE_VAR_EXPORT negotiation_module;
  +module AP_MODULE_DECLARE_DATA negotiation_module;
   
   static void *create_neg_dir_config(apr_pool_t *p, char *dummy)
   {
  @@ -2748,7 +2748,7 @@
       ap_hook_type_checker(handle_multi,NULL,NULL,AP_HOOK_FIRST);
   }
   
  -module MODULE_VAR_EXPORT negotiation_module =
  +module AP_MODULE_DECLARE_DATA negotiation_module =
   {
       STANDARD20_MODULE_STUFF,
       create_neg_dir_config,      /* dir config creator */
  
  
  
  1.42      +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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- mod_rewrite.c	2000/09/23 00:05:45	1.41
  +++ mod_rewrite.c	2000/10/16 06:05:06	1.42
  @@ -223,7 +223,7 @@
   }
   
       /* the main config structure */
  -module MODULE_VAR_EXPORT rewrite_module = {
  +module AP_MODULE_DECLARE_DATA rewrite_module = {
      STANDARD20_MODULE_STUFF,
      config_perdir_create,        /* create per-dir    config structures */
      config_perdir_merge,         /* merge  per-dir    config structures */
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_setenvif.c	2000/08/06 06:07:47	1.18
  +++ mod_setenvif.c	2000/10/16 06:05:07	1.19
  @@ -150,7 +150,7 @@
       apr_array_header_t *conditionals;
   } sei_cfg_rec;
   
  -module MODULE_VAR_EXPORT setenvif_module;
  +module AP_MODULE_DECLARE_DATA setenvif_module;
   
   /*
    * These routines, the create- and merge-config functions, are called
  @@ -458,7 +458,7 @@
       ap_hook_post_read_request(match_headers, NULL, NULL, AP_HOOK_MIDDLE);
   }
   
  -module MODULE_VAR_EXPORT setenvif_module =
  +module AP_MODULE_DECLARE_DATA setenvif_module =
   {
       STANDARD20_MODULE_STUFF,
       create_setenvif_config_dir, /* dir config creater */
  
  
  
  1.28      +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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_so.c	2000/08/02 05:27:17	1.27
  +++ mod_so.c	2000/10/16 06:05:07	1.28
  @@ -135,7 +135,7 @@
   #include "apr_dso.h"
   #include "apr_strings.h"
   
  -module MODULE_VAR_EXPORT so_module;
  +module AP_MODULE_DECLARE_DATA so_module;
   
   
   /*
  @@ -368,7 +368,7 @@
       { NULL }
   };
   
  -module MODULE_VAR_EXPORT so_module = {
  +module AP_MODULE_DECLARE_DATA so_module = {
      STANDARD20_MODULE_STUFF,
      NULL,			    /* create per-dir config */
      NULL,			    /* merge per-dir config */
  
  
  
  1.20      +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_speling.c	2000/08/06 06:07:48	1.19
  +++ mod_speling.c	2000/10/16 06:05:07	1.20
  @@ -88,7 +88,7 @@
    * Activate it with "CheckSpelling On"
    */
   
  -MODULE_VAR_EXPORT module speling_module;
  +AP_MODULE_DECLARE_DATA module speling_module;
   
   typedef struct {
       int enabled;
  @@ -555,7 +555,7 @@
       ap_hook_fixups(check_speling,NULL,NULL,AP_HOOK_LAST);
   }
   
  -module MODULE_VAR_EXPORT speling_module =
  +module AP_MODULE_DECLARE_DATA speling_module =
   {
       STANDARD20_MODULE_STUFF,
       create_mconfig_for_directory,  /* create per-dir config */
  
  
  
  1.14      +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_status.c	2000/08/02 05:27:17	1.13
  +++ mod_status.c	2000/10/16 06:05:07	1.14
  @@ -68,7 +68,7 @@
   
   #define STATUS_MAGIC_TYPE "application/x-httpd-status"
   
  -module MODULE_VAR_EXPORT status_module;
  +module AP_MODULE_DECLARE_DATA 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 AP_MODULE_DECLARE_DATA status_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* create per-dir config */
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_unique_id.c	2000/08/06 06:07:48	1.18
  +++ mod_unique_id.c	2000/10/16 06:05:07	1.19
  @@ -392,7 +392,7 @@
       ap_hook_post_read_request(gen_unique_id, NULL, NULL, AP_HOOK_MIDDLE); 
   }
   
  -module MODULE_VAR_EXPORT unique_id_module = {
  +module AP_MODULE_DECLARE_DATA unique_id_module = {
       STANDARD20_MODULE_STUFF,
       NULL,                       /* dir config creater */
       NULL,                       /* dir merger --- default is to override */
  
  
  
  1.21      +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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_usertrack.c	2000/08/06 22:38:23	1.20
  +++ mod_usertrack.c	2000/10/16 06:05:07	1.21
  @@ -106,7 +106,7 @@
   #include "http_request.h"
   #include "apr_strings.h"
   
  -module MODULE_VAR_EXPORT usertrack_module;
  +module AP_MODULE_DECLARE_DATA usertrack_module;
   
   typedef struct {
       int always;
  @@ -308,7 +308,7 @@
   {
       ap_hook_fixups(spot_cookie,NULL,NULL,AP_HOOK_MIDDLE);
   }
  -module MODULE_VAR_EXPORT usertrack_module = {
  +module AP_MODULE_DECLARE_DATA usertrack_module = {
       STANDARD20_MODULE_STUFF,
       make_cookie_dir,            /* dir config creater */
       NULL,                       /* dir merger --- default is to override */
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_vhost_alias.c	2000/08/06 06:07:48	1.14
  +++ mod_vhost_alias.c	2000/10/16 06:05:07	1.15
  @@ -83,7 +83,7 @@
   #include "http_request.h"  /* for ap_hook_translate_name */
   
   
  -module MODULE_VAR_EXPORT vhost_alias_module;
  +module AP_MODULE_DECLARE_DATA vhost_alias_module;
   
   
   /*
  @@ -468,7 +468,7 @@
       ap_hook_translate_name(mva_translate, NULL, NULL, AP_HOOK_MIDDLE);
   };
   
  -module MODULE_VAR_EXPORT vhost_alias_module =
  +module AP_MODULE_DECLARE_DATA vhost_alias_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,			/* dir config creater */
  
  
  
  1.15      +1 -1      apache-2.0/src/os/os2/util_os2.c
  
  Index: util_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/os2/util_os2.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- util_os2.c	2000/10/15 20:13:24	1.14
  +++ util_os2.c	2000/10/16 06:05:12	1.15
  @@ -69,7 +69,7 @@
   #include <string.h>
   
   
  -API_EXPORT(char *)ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile)
  +AP_DECLARE(char *)ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile)
   {
       char buf[HUGE_STRING_LEN];
       char buf2[HUGE_STRING_LEN];
  
  
  
  1.25      +1 -1      apache-2.0/src/os/unix/unixd.c
  
  Index: unixd.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/unix/unixd.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- unixd.c	2000/08/23 23:28:54	1.24
  +++ unixd.c	2000/10/16 06:05:12	1.25
  @@ -339,7 +339,7 @@
   }
   #endif /* NEED_AP_SYS_SIGLIST */
   
  -API_EXPORT(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, 
  +AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, 
                              const char *arg, const char * arg2, int type)
   {
   #if (defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS)) && APR_HAVE_STRUCT_RLIMIT && APR_HAVE_GETRLIMIT
  
  
  
  1.13      +1 -1      apache-2.0/src/os/unix/unixd.h
  
  Index: unixd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/unix/unixd.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- unixd.h	2000/06/20 19:16:18	1.12
  +++ unixd.h	2000/10/16 06:05:12	1.13
  @@ -89,7 +89,7 @@
   const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg);
   #if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || \
       defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
  -API_EXPORT(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
  +AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
                              const char *arg, const char * arg2, int type);
   #endif
   
  
  
  
  1.12      +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_dll.c	2000/08/02 05:27:29	1.11
  +++ mod_dll.c	2000/10/16 06:05:13	1.12
  @@ -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: AP_MODULE_DECLARE_DATA. i.e. if you have
    *    "module foo_module;", replace it with
  - *    "module MODULE_VAR_EXPORT foo_module;". If your module is to be
  + *    "module AP_MODULE_DECLARE_DATA foo_module;". If your module is to be
    *    compiled with both Windows and Unix, you may wish to use an #ifdef
    *    WIN32
    *
  
  
  
  1.43      +4 -4      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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- os.h	2000/10/15 19:38:50	1.42
  +++ os.h	2000/10/16 06:05:13	1.43
  @@ -125,10 +125,10 @@
   }
   
   /* OS-dependent filename routines in util_win32.c */
  -API_EXPORT(char *) ap_os_canonical_filename(apr_pool_t *p, const char *file);
  -API_EXPORT(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile);
  -API_EXPORT(char *) ap_os_systemcase_filename(apr_pool_t *pPool, const char *szFile);
  -API_EXPORT(int) ap_os_is_filename_valid(const char *file);
  +AP_DECLARE(char *) ap_os_canonical_filename(apr_pool_t *p, const char *file);
  +AP_DECLARE(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile);
  +AP_DECLARE(char *) ap_os_systemcase_filename(apr_pool_t *pPool, const char *szFile);
  +AP_DECLARE(int) ap_os_is_filename_valid(const char *file);
   
   typedef void thread;
   typedef void event;
  
  
  
  1.17      +4 -4      apache-2.0/src/os/win32/util_win32.c
  
  Index: util_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/util_win32.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- util_win32.c	2000/10/13 16:57:21	1.16
  +++ util_win32.c	2000/10/16 06:05:13	1.17
  @@ -86,7 +86,7 @@
    * is present on the existing path.  This routine also
    * converts alias names to long names.
    */
  -API_EXPORT(char *) ap_os_systemcase_filename(apr_pool_t *pPool, 
  +AP_DECLARE(char *) ap_os_systemcase_filename(apr_pool_t *pPool, 
                                                const char *szFile)
   {
       char buf[HUGE_STRING_LEN];
  @@ -227,7 +227,7 @@
   /*  Perform canonicalization with the exception that the
    *  input case is preserved.
    */
  -API_EXPORT(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, 
  +AP_DECLARE(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, 
                                                    const char *szFile)
   {
       char *pNewStr;
  @@ -353,7 +353,7 @@
   
   /*  Perform complete canonicalization.
    */
  -API_EXPORT(char *) ap_os_canonical_filename(apr_pool_t *pPool, const char *szFile)
  +AP_DECLARE(char *) ap_os_canonical_filename(apr_pool_t *pPool, const char *szFile)
   {
       char *pNewName;
       pNewName = ap_os_case_canonical_filename(pPool, szFile);
  @@ -394,7 +394,7 @@
    * If the path fails ANY of these tests, the result must be to deny access.
    */
   
  -API_EXPORT(int) ap_os_is_filename_valid(const char *file)
  +AP_DECLARE(int) ap_os_is_filename_valid(const char *file)
   {
       const char *segstart;
       unsigned int seglength;
  
  
  
  1.11      +2 -2      apache-2.0/src/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/apxs.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apxs.in	2000/06/25 23:44:16	1.10
  +++ apxs.in	2000/10/16 06:05:14	1.11
  @@ -426,7 +426,7 @@
                   open(FP, "<$base.c");
                   my $content = join('', <FP>);
                   close(FP);
  -                if ($content =~ m|.*module\s+(?:MODULE_VAR_EXPORT\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
  +                if ($content =~ m|.*module\s+(?:AP_MODULE_DECLARE_DATA\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
                       $name = "$1";
                       $filename = "$base.c";
                       $filename =~ s|^[^/]+/||;
  @@ -620,7 +620,7 @@
   };
   
   /* Dispatch list for API hooks */
  -module MODULE_VAR_EXPORT %NAME%_module = {
  +module AP_MODULE_DECLARE_DATA %NAME%_module = {
       STANDARD20_MODULE_STUFF, 
       NULL,                  /* create per-dir    config structures */
       NULL,                  /* merge  per-dir    config structures */
  
  
  
  1.2       +1 -1      apache-2.0/src/test/test_date.c
  
  Index: test_date.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/test/test_date.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test_date.c	1999/08/24 06:46:02	1.1
  +++ test_date.c	2000/10/16 06:05:15	1.2
  @@ -10,7 +10,7 @@
    * 
    * Roy Fielding, 1996
    */
  -#define API_EXPORT(x) x
  +#define AP_DECLARE(x) x
   
   #include <stdio.h>
   #include <stdlib.h>
  
  
  
  1.5       +3 -3      apache-2.0/src/test/test_find.c
  
  Index: test_find.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/test/test_find.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- test_find.c	2000/08/02 05:27:38	1.4
  +++ test_find.c	2000/10/16 06:05:15	1.5
  @@ -23,17 +23,17 @@
   void *ap_dummy_mutex = &ap_dummy_mutex;
   char *ap_server_argv0;
   
  -API_EXPORT(void) ap_block_alarms(void)
  +AP_DECLARE(void) ap_block_alarms(void)
   {
       ;
   }
   
  -API_EXPORT(void) ap_unblock_alarms(void)
  +AP_DECLARE(void) ap_unblock_alarms(void)
   {
       ;
   }
   
  -API_EXPORT(void) ap_log_error(const char *file, int line, int level,
  +AP_DECLARE(void) ap_log_error(const char *file, int line, int level,
                                 const request_rec *r, const char *fmt, ...)
   {
       ;
  
  
  
  1.5       +3 -3      apache-2.0/src/test/test_parser.c
  
  Index: test_parser.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/test/test_parser.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- test_parser.c	2000/08/02 05:27:38	1.4
  +++ test_parser.c	2000/10/16 06:05:15	1.5
  @@ -23,17 +23,17 @@
   void *ap_dummy_mutex = &ap_dummy_mutex;
   char *ap_server_argv0;
   
  -API_EXPORT(void) ap_block_alarms(void)
  +AP_DECLARE(void) ap_block_alarms(void)
   {
       ;
   }
   
  -API_EXPORT(void) ap_unblock_alarms(void)
  +AP_DECLARE(void) ap_unblock_alarms(void)
   {
       ;
   }
   
  -API_EXPORT(void) ap_log_error(const char *file, int line, int level,
  +AP_DECLARE(void) ap_log_error(const char *file, int line, int level,
                                  const request_rec *r, const char *fmt, ...)
   {
       ;
  
  
  

Mime
View raw message