apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apr-util/src/hooks ap_hooks.c
Date Thu, 21 Dec 2000 18:06:19 GMT
wrowe       00/12/21 10:06:18

  Modified:    .        aprutil.dsp libaprutil.dsp
               include  ap_base64.h ap_buckets.h ap_hooks.h ap_sha1.h
                        apr_dbm.h
               src/buckets ap_buckets.c ap_buckets_eos.c ap_buckets_file.c
                        ap_buckets_flush.c ap_buckets_heap.c
                        ap_buckets_mmap.c ap_buckets_pipe.c
                        ap_buckets_pool.c ap_buckets_refcount.c
                        ap_buckets_simple.c ap_buckets_socket.c
               src/crypto ap_sha1.c
               src/encoding ap_base64.c
               src/hooks ap_hooks.c
  Log:
    The APU_DECLARE symbol rename to solve DAV faults and other lurking
    dangers.  Someone please add the build of apu.h from apu.h.in for Unix.
    This is not complete, there may be other lurking data that were never
    exported (with APR_DECLARE).  This patch doesn't attempt to fix them.
  
  Revision  Changes    Path
  1.12      +104 -66   apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- aprutil.dsp	2000/12/21 01:25:00	1.11
  +++ aprutil.dsp	2000/12/21 18:06:12	1.12
  @@ -26,7 +26,6 @@
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  -RSC=rc.exe
   
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
  @@ -40,16 +39,17 @@
   # PROP Output_Dir "LibR"
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"LibR\aprutil" /FD /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"LibR\aprutil" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo /out:"LibR\aprutil.lib"
  +# ADD LIB32 /nologo
   
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
  @@ -64,16 +64,17 @@
   # PROP Intermediate_Dir "LibD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /Fd"LibD\aprutil" /FD /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  +# ADD BASE CPP /nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /ZI /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"LibD\aprutil" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo /out:"LibD\aprutil.lib"
  +# ADD LIB32 /nologo
   
   !ENDIF 
   
  @@ -81,67 +82,9 @@
   
   # Name "aprutil - Win32 Release"
   # Name "aprutil - Win32 Debug"
  -# Begin Group "Generated Headers"
  +# Begin Group "Source Files"
   
   # PROP Default_Filter ""
  -# Begin Source File
  -
  -SOURCE=.\include\private\apu_private.hw
  -
  -!IF  "$(CFG)" == "aprutil - Win32 Release"
  -
  -# Begin Custom Build
  -InputPath=.\include\private\apu_private.hw
  -
  -".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\private\apu_private.hw .\include\private\apu_private.h > nul 
  -	echo Created apu_private.h from apu_private.hw 
  -	
  -# End Custom Build
  -
  -!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  -
  -# Begin Custom Build
  -InputPath=.\include\private\apu_private.hw
  -
  -".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\private\apu_private.hw .\include\private\apu_private.h > nul 
  -	echo Created apu_private.h from apu_private.hw 
  -	
  -# End Custom Build
  -
  -!ENDIF 
  -
  -# End Source File
  -# End Group
  -# Begin Group "External Headers"
  -
  -# PROP Default_Filter ""
  -# Begin Source File
  -
  -SOURCE=.\include\ap_base64.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\include\ap_buckets.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\include\ap_hooks.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\include\ap_ring.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\include\ap_sha1.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\include\apr_dbm.h
  -# End Source File
  -# End Group
   # Begin Group "buckets"
   
   # PROP Default_Filter ""
  @@ -261,6 +204,101 @@
   # Begin Group "xml"
   
   # PROP Default_Filter ""
  +# End Group
  +# End Group
  +# Begin Group "Generated Headers"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\apu.h.in
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apu.hw
  +
  +!IF  "$(CFG)" == "aprutil - Win32 Release"
  +
  +# Begin Custom Build
  +InputPath=.\include\apu.hw
  +
  +".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apu.hw .\include\apu.h > nul 
  +	echo Created apu.h from apu.hw 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  +
  +# Begin Custom Build
  +InputPath=.\include\apu.hw
  +
  +".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apu.hw .\include\apu.h > nul 
  +	echo Created apu.h from apu.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\private\apu_private.hw
  +
  +!IF  "$(CFG)" == "aprutil - Win32 Release"
  +
  +# Begin Custom Build
  +InputPath=.\include\private\apu_private.hw
  +
  +".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\private\apu_private.hw .\include\private\apu_private.h > nul 
  +	echo Created apu_private.h from apu_private.hw 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  +
  +# Begin Custom Build
  +InputPath=.\include\private\apu_private.hw
  +
  +".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\private\apu_private.hw .\include\private\apu_private.h > nul 
  +	echo Created apu_private.h from apu_private.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# End Group
  +# Begin Group "External Headers"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\ap_base64.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_buckets.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_hooks.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_ring.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_sha1.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_dbm.h
  +# End Source File
   # End Group
   # End Target
   # End Project
  
  
  
  1.5       +5 -5      apr-util/libaprutil.dsp
  
  Index: libaprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- libaprutil.dsp	2000/12/21 01:25:01	1.4
  +++ libaprutil.dsp	2000/12/21 18:06:12	1.5
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\libaprutil" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Release\libaprutil" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -52,8 +52,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED0000" /subsystem:windows /dll /incremental:no /map /machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED0000" /subsystem:windows /dll /incremental:no /map /machine:I386
  +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED0000" /subsystem:windows /dll /map /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED0000" /subsystem:windows /dll /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
   
  @@ -68,8 +68,8 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /Fd"Debug\libaprutil" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /ZI /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\libaprutil" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.11      +7 -6      apr-util/include/ap_base64.h
  
  Index: ap_base64.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_base64.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap_base64.h	2000/12/05 14:27:04	1.10
  +++ ap_base64.h	2000/12/21 18:06:13	1.11
  @@ -59,6 +59,7 @@
   #ifndef APACHE_BASE64_H
   #define APACHE_BASE64_H
   
  +#include "apu.h"
   #include "apr_general.h"
   
   #ifdef __cplusplus
  @@ -89,7 +90,7 @@
    * @return the length of the string after it is encrypted
    * @deffunc int ap_base64encode_len(int len)
    */ 
  -APR_DECLARE(int) ap_base64encode_len(int len);
  +APU_DECLARE(int) ap_base64encode_len(int len);
   
   /**
    * Encode a text string using base64encoding.
  @@ -99,7 +100,7 @@
    * @return the length of the encoded string
    * @deffunc int ap_base64encode(char *coded_dst, const char *plain_src, int len_plain_src)
    */ 
  -APR_DECLARE(int) ap_base64encode(char * coded_dst, const char *plain_src,int len_plain_src);
  +APU_DECLARE(int) ap_base64encode(char * coded_dst, const char *plain_src,int len_plain_src);
   
   /**
    * Encode an EBCDIC string using base64encoding.
  @@ -109,7 +110,7 @@
    * @return the length of the encoded string
    * @deffunc int ap_base64encode_binary(char *coded_dst, const char *plain_src, int len_plain_src)
    */ 
  -APR_DECLARE(int) ap_base64encode_binary(char * coded_dst, const unsigned char *plain_src,int len_plain_src);
  +APU_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
  @@ -117,7 +118,7 @@
    * @return the length of the plain text string
    * @deffunc int ap_base64decode_len(const char *coded_src)
    */ 
  -APR_DECLARE(int) ap_base64decode_len(const char * coded_src);
  +APU_DECLARE(int) ap_base64decode_len(const char * coded_src);
   
   /**
    * Decode a string to plain text
  @@ -126,7 +127,7 @@
    * @return the length of the plain text string
    * @deffunc int ap_base64decode(char *plain_dst, const char *coded_src)
    */ 
  -APR_DECLARE(int) ap_base64decode(char * plain_dst, const char *coded_src);
  +APU_DECLARE(int) ap_base64decode(char * plain_dst, const char *coded_src);
   
   /**
    * Decode an EBCDIC string to plain text
  @@ -135,7 +136,7 @@
    * @return the length of the plain text string
    * @deffunc int ap_base64decode_binary(char *plain_dst, const char *coded_src)
    */ 
  -APR_DECLARE(int) ap_base64decode_binary(unsigned char * plain_dst, const char *coded_src);
  +APU_DECLARE(int) ap_base64decode_binary(unsigned char * plain_dst, const char *coded_src);
   
   #ifdef __cplusplus
   }
  
  
  
  1.61      +49 -48    apr-util/include/ap_buckets.h
  
  Index: ap_buckets.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_buckets.h,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- ap_buckets.h	2000/12/12 12:18:42	1.60
  +++ ap_buckets.h	2000/12/21 18:06:13	1.61
  @@ -55,6 +55,7 @@
   #ifndef AP_BUCKETS_H
   #define AP_BUCKETS_H
   
  +#include "apu.h"
   #include "apr_network_io.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  @@ -560,7 +561,7 @@
    * @return The empty bucket brigade
    * @deffunc ap_bucket_brigade *ap_brigade_create(apr_pool_t *p)
    */
  -APR_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
  +APU_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
   
   /**
    * destroy an entire bucket brigade.  This includes destroying all of the
  @@ -568,7 +569,7 @@
    * @param b The bucket brigade to destroy
    * @deffunc apr_status_t ap_brigade_destroy(ap_bucket_brigade *b)
    */
  -APR_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b);
  +APU_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b);
   
   /**
    * Split a bucket brigade into two, such that the given bucket is the
  @@ -580,7 +581,7 @@
    * @return The new brigade
    * @deffunc ap_bucket_brigade *ap_brigade_split(ap_bucket_brigade *b, ap_bucket *e)
    */
  -APR_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
  +APU_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
   						 ap_bucket *e);
   
   /**
  @@ -593,7 +594,7 @@
    *         or NULL in any error condition (including partition past the end)
    * @deffunc ap_bucket *ap_brigade_partition(ap_bucket_brigade *b, apr_off_t point)
    */
  -APR_DECLARE(ap_bucket *) ap_brigade_partition(ap_bucket_brigade *b, apr_off_t point);
  +APU_DECLARE(ap_bucket *) ap_brigade_partition(ap_bucket_brigade *b, apr_off_t point);
   
   #if APR_NOT_DONE_YET
   /**
  @@ -603,7 +604,7 @@
    * @param nbytes The number of bytes to consume
    * @deffunc void ap_brigade_consume(ap_bucket_brigade *b, int nbytes)
    */
  -APR_DECLARE(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
  +APU_DECLARE(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
   #endif
   
   /**
  @@ -616,7 +617,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);
    */
  -APR_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +APU_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
   				    struct iovec *vec, int nvec);
   
   /**
  @@ -627,7 +628,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
    */
  -APR_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
  +APU_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
   
   /**
    * This function writes an unspecified number of strings into a bucket brigade.
  @@ -637,7 +638,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_putstrs(ap_bucket_brigade *b, ...)
    */
  -APR_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...);
  +APU_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...);
   
   /**
    * Evaluate a printf and put the resulting string into a bucket at the end 
  @@ -648,7 +649,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...) 
    */
  -APR_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
  +APU_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 
  @@ -659,7 +660,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) 
    */
  -APR_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
  +APU_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
   
   
   /*  *****  Bucket Functions  *****  */
  @@ -726,7 +727,7 @@
    * @return APR_ENOTIMPL
    * @deffunc apr_status_t ap_bucket_setaside_notimpl(ap_bucket *data)
    */ 
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data);
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data);
   /**
    * A place holder function that signifies that the split function was not
    * implemented for this bucket
  @@ -735,7 +736,7 @@
    * @return APR_ENOTIMPL
    * @deffunc apr_status_t ap_bucket_split_notimpl(ap_bucket *data)
    */ 
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, 
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, 
                                                    apr_off_t point);
   /**
    * A place holder function that signifies that the copy function was not
  @@ -745,7 +746,7 @@
    * @return APR_ENOTIMPL
    * @deffunc apr_status_t ap_bucket_copy_notimpl(ap_bucket *e, ap_bucket **c)
    */
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_notimpl(ap_bucket *e,
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_notimpl(ap_bucket *e,
                                                           ap_bucket **c);
   /**
    * A place holder function that signifies that the destroy function was not
  @@ -753,7 +754,7 @@
    * @param data The bucket to destroy
    * @deffunc void ap_bucket_destroy(ap_bucket *data)
    */ 
  -APR_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data);
  +APU_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data);
   /* There is no ap_bucket_read_notimpl, because it is a required function
    */
   
  @@ -769,52 +770,52 @@
    * The flush bucket type.  This signifies that all data should be flushed to
    * the next filter.  The flush bucket should be sent with the other buckets.
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_flush_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_flush_type;
   /**
    * The EOS bucket type.  This signifies that there will be no more data, ever.
    * All filters MUST send all data to the next filter when they receive a
    * bucket of this type
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_eos_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_eos_type;
   /**
    * The FILE bucket type.  This bucket represents a file on disk
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_file_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_file_type;
   /**
    * The HEAP bucket type.  This bucket represents a data allocated out of the
    * heap.
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_heap_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_heap_type;
   /**
    * The MMAP bucket type.  This bucket represents an MMAP'ed file
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_mmap_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_mmap_type;
   /**
    * The POOL bucket type.  This bucket represents a data that was allocated
    * out of a pool.  IF this bucket is still available when the pool is cleared,
    * the data is copied on to the heap.
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_pool_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_pool_type;
   /**
    * The PIPE bucket type.  This bucket represents a pipe to another program.
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_pipe_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_pipe_type;
   /**
    * The IMMORTAL bucket type.  This bucket represents a segment of data that
    * the creator is willing to take responsability for.  The core will do
    * nothing with the data in an immortal bucket
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_immortal_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_immortal_type;
   /**
    * The TRANSIENT bucket type.  This bucket represents a data allocated off
    * the stack.  When the setaside function is called, this data is copied on
    * to the heap
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_transient_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_transient_type;
   /**
    * The SOCKET bucket type.  This bucket represents a socket to another machine
    */
  -APR_DECLARE_DATA extern const ap_bucket_type ap_socket_type;
  +APU_DECLARE_DATA extern const ap_bucket_type ap_socket_type;
   
   
   /*  *****  Shared reference-counted buckets  *****  */
  @@ -836,7 +837,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_shared(ap_bucket_refcount *r, apr_off_t start, apr_off_t end) 
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
   					      apr_off_t start, apr_off_t end);
   
   /**
  @@ -849,7 +850,7 @@
    *         must be destroyed because its reference count is zero
    * @deffunc void *ap_bucket_destroy_shared(ap_bucket *b)
    */
  -APR_DECLARE(void *) ap_bucket_destroy_shared(void *data);
  +APU_DECLARE(void *) ap_bucket_destroy_shared(void *data);
   
   /**
    * Split a bucket into two at the given point, and adjust the refcount
  @@ -863,7 +864,7 @@
    *         or APR_SUCCESS
    * @deffunc apr_status_t ap_bucket_split_shared(ap_bucket *b, apr_off_t point)
    */
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
   
   /**
    * Copy a refcounted bucket, incrementing the reference count. Most
  @@ -875,7 +876,7 @@
              or APR_SUCCESS
    * @deffunc apr_status_t ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c)
    */
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c);
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c);
   
   
   /*  *****  Functions to Create Buckets of varying type  *****  */
  @@ -916,7 +917,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_eos(void)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_eos(void);
  +APU_DECLARE(ap_bucket *) ap_bucket_create_eos(void);
   /**
    * Make the bucket passed in an EOS bucket.  This indicates that there is no 
    * more data coming from down the filter stack.  All filters should flush at 
  @@ -925,7 +926,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_eos(ap_bucket *b)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b);
  +APU_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b);
   
   /**
    * Create a flush  bucket.  This indicates that filters should flush their
  @@ -934,7 +935,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_flush(void)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_flush(void);
  +APU_DECLARE(ap_bucket *) ap_bucket_create_flush(void);
   /**
    * Make the bucket passed in a FLUSH  bucket.  This indicates that filters 
    * should flush their data.  There is no guarantee that they will flush it, 
  @@ -943,7 +944,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_flush(ap_bucket *b)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b);
  +APU_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b);
   
   /**
    * Create a bucket referring to long-lived data.
  @@ -952,7 +953,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_size_t *w)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_immortal(
  +APU_DECLARE(ap_bucket *) ap_bucket_create_immortal(
   		const char *buf, apr_size_t nbyte);
   /**
    * Make the bucket passed in a bucket refer to long-lived data
  @@ -963,7 +964,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_immortal(ap_bucket *b, const char *buf, apr_size_t nbyte, apr_size_t *w)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
   		const char *buf, apr_size_t nbyte);
   
   /**
  @@ -973,7 +974,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_size_t *w)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_transient(
  +APU_DECLARE(ap_bucket *) ap_bucket_create_transient(
   		const char *buf, apr_size_t nbyte);
   /**
    * Make the bucket passed in a bucket refer to stack data
  @@ -983,7 +984,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_transient(ap_bucket *b, const char *buf, apr_size_t nbyte)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
   		const char *buf, apr_size_t nbyte);
   
   /**
  @@ -1001,7 +1002,7 @@
    * @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_size_t *w)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_heap(
  +APU_DECLARE(ap_bucket *) ap_bucket_create_heap(
   		const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
   /**
    * Make the bucket passed in a bucket refer to heap data
  @@ -1014,7 +1015,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_heap(ap_bucket *b, const char *buf, apr_size_t nbyte, int copy, apr_size_t *w)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
   		const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
   
   /**
  @@ -1024,7 +1025,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_pool(const char *buf, apr_size_t *length, apr_pool_t *p)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_pool(const char *buf,  
  +APU_DECLARE(ap_bucket *) ap_bucket_create_pool(const char *buf,  
                                               apr_size_t length, apr_pool_t *p);
   /**
    * Make the bucket passed in a bucket refer to pool data
  @@ -1034,7 +1035,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_pool(ap_bucket *b, const char *buf, apr_size_t *length, apr_pool_t *p)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
   		const char *buf, apr_size_t length, apr_pool_t *p);
   
   /**
  @@ -1046,7 +1047,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_mmap(const apr_mmap_t *mm, apr_size_t start, apr_size_t length)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_mmap(
  +APU_DECLARE(ap_bucket *) ap_bucket_create_mmap(
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
   /**
    * Make the bucket passed in a bucket refer to an MMAP'ed file
  @@ -1058,7 +1059,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_mmap(ap_bucket *b, const apr_mmap_t *mm, apr_size_t start, apr_size_t length)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
   
   /**
  @@ -1067,7 +1068,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_socket(apr_socket_t *thissocket)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *thissock);
  +APU_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *thissock);
   /**
    * Make the bucket passed in a bucket refer to a socket
    * @param b The bucket to make into a SOCKET bucket
  @@ -1075,7 +1076,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissocket)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
  +APU_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
   
   /**
    * Create a bucket referring to a pipe.
  @@ -1083,7 +1084,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_pipe(apr_file_t *thispipe)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *thispipe);
  +APU_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *thispipe);
   /**
    * Make the bucket passed in a bucket refer to a pipe
    * @param b The bucket to make into a PIPE bucket
  @@ -1091,7 +1092,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
  +APU_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
   
   /**
    * Create a bucket referring to a file.
  @@ -1101,7 +1102,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t len)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t len);
  +APU_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t len);
   /**
    * Make the bucket passed in a bucket refer to a file
    * @param b The bucket to make into a FILE bucket
  @@ -1111,7 +1112,7 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, apr_off_t offset, apr_size_t len)
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, 
  +APU_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.29      +8 -7      apr-util/include/ap_hooks.h
  
  Index: ap_hooks.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_hooks.h,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ap_hooks.h	2000/12/06 05:59:51	1.28
  +++ ap_hooks.h	2000/12/21 18:06:13	1.29
  @@ -55,6 +55,7 @@
   #ifndef APACHE_AP_HOOKS_H
   #define APACHE_AP_HOOKS_H
   
  +#include "apu.h"
   /* For apr_array_header_t */
   #include "apr_tables.h"
   
  @@ -212,20 +213,20 @@
    * The global pool used to allocate any memory needed by the hooks.
    * @defvar apr_pool_t *ap_global_hook_pool
    */ 
  -extern APR_DECLARE_DATA apr_pool_t *ap_global_hook_pool;
  +extern APU_DECLARE_DATA apr_pool_t *ap_global_hook_pool;
   
   /**
    * A global variable to determine if debugging information about the
    * hooks functions should be printed
    * @defvar apr_pool_t *ap_debug_module_hooks
    */ 
  -extern APR_DECLARE_DATA int ap_debug_module_hooks;
  +extern APU_DECLARE_DATA int ap_debug_module_hooks;
   
   /**
    * The name of the module that is currently registering a function
    * @defvar apr_pool_t *ap_debug_module_name
    */ 
  -extern APR_DECLARE_DATA const char *ap_debug_module_name;
  +extern APU_DECLARE_DATA const char *ap_debug_module_name;
   
   /**
    * Register a hook function to be sorted
  @@ -233,13 +234,13 @@
    * @param aHooks The array which stores all of the functions for this hook
    * @deffunc void ap_hook_sort_register(const char *szHookName, ap_arry_header_t **aHooks)
    */
  -APR_DECLARE(void) ap_hook_sort_register(const char *szHookName, 
  +APU_DECLARE(void) ap_hook_sort_register(const char *szHookName, 
                                          apr_array_header_t **aHooks);
   /**
    * Sort all of the registerd functions for a given hook
    * @deffunc void ap_sort_hooks(void)
    */
  -APR_DECLARE(void) ap_sort_hooks(void);
  +APU_DECLARE(void) ap_sort_hooks(void);
   
   /**
    * Print all of the information about the current hook.  This is used for
  @@ -249,13 +250,13 @@
    * @param aszSucc All of the functions in the successor array
    * @deffunc void ap_show_hook(const char *szName, const char *const *aszPre, const char *const *aszSucc)
    */
  -APR_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
  +APU_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
                                 const char * const *aszSucc);
   
   /**
    * Remove all currently registered functions.
    * @deffunc void ap_hook_deregister_all(void)
    */
  -APR_DECLARE(void) ap_hook_deregister_all(void);
  +APU_DECLARE(void) ap_hook_deregister_all(void);
   
   #endif /* ndef(AP_HOOKS_H) */
  
  
  
  1.14      +6 -5      apr-util/include/ap_sha1.h
  
  Index: ap_sha1.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_sha1.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap_sha1.h	2000/12/05 14:27:05	1.13
  +++ ap_sha1.h	2000/12/21 18:06:13	1.14
  @@ -61,6 +61,7 @@
   #ifndef APACHE_SHA1_H
   #define APACHE_SHA1_H
   
  +#include "apu.h"
   #include "apr_general.h"
   
   #ifdef __cplusplus
  @@ -113,14 +114,14 @@
    *     to break since the search space is smaller.
    * @deffunc void ap_sha1_base64(const char *clear, int len, char *out)
    */
  -APR_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out);
  +APU_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);
    */
  -APR_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *context);
  +APU_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *context);
   
   /**
    * Update the SHA digest
  @@ -129,7 +130,7 @@
    * @param inputLen The length of the input buffer
    * @deffunc void ap_SHA1Update(AP_SHA1_CTX *context, const char *input, unsigned int inputLen)
    */
  -APR_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *context, const char *input,
  +APU_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *context, const char *input,
                                 unsigned int inputLen);
   
   /**
  @@ -139,7 +140,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)
    */
  -APR_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *context,
  +APU_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *context,
                                        const unsigned char *input,
                                        unsigned int inputLen);
   
  @@ -149,7 +150,7 @@
    * @param context The context to finalize
    * @deffunc void ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], AP_SHA1_CTX *context)
    */
  -APR_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
  +APU_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
                                AP_SHA1_CTX *context);
   
   #ifdef __cplusplus
  
  
  
  1.5       +1 -0      apr-util/include/apr_dbm.h
  
  Index: apr_dbm.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_dbm.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_dbm.h	2000/12/08 17:18:06	1.4
  +++ apr_dbm.h	2000/12/21 18:06:13	1.5
  @@ -55,6 +55,7 @@
   #ifndef APR_DBM_H
   #define APR_DBM_H
   
  +#include "apu.h"
   #include "apr.h"
   #include "apr_errno.h"
   #include "apr_pools.h"
  
  
  
  1.38      +13 -13    apr-util/src/buckets/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- ap_buckets.c	2000/12/12 12:18:46	1.37
  +++ ap_buckets.c	2000/12/21 18:06:14	1.38
  @@ -86,13 +86,13 @@
        */
       return APR_SUCCESS;
   }
  -APR_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b)
  +APU_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);
   }
   
  -APR_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
  +APU_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
   {
       ap_bucket_brigade *b;
   
  @@ -104,7 +104,7 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
  +APU_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
   						 ap_bucket *e)
   {
       ap_bucket_brigade *a;
  @@ -122,7 +122,7 @@
       return a;
   }
   
  -APR_DECLARE(ap_bucket *) ap_brigade_partition(ap_bucket_brigade *b, apr_off_t point)
  +APU_DECLARE(ap_bucket *) ap_brigade_partition(ap_bucket_brigade *b, apr_off_t point)
   {
       ap_bucket *e;
       const char *s;
  @@ -166,7 +166,7 @@
       return NULL;
   }
   
  -APR_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +APU_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
   				    struct iovec *vec, int nvec)
   {
       ap_bucket *e;
  @@ -184,7 +184,7 @@
       return vec - orig;
   }
   
  -APR_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
  +APU_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
   {
       ap_bucket *r;
       const char *x;
  @@ -211,7 +211,7 @@
       return k;
   }
   
  -APR_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...)
  +APU_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...)
   {
       va_list va;
       int written;
  @@ -222,7 +222,7 @@
       return written;
   }
   
  -APR_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
  +APU_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
   {
       va_list ap;
       int res;
  @@ -233,7 +233,7 @@
       return res;
   }
   
  -APR_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
  +APU_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
  @@ -276,20 +276,20 @@
       return bucket_types->nelts - 1;
   }
   
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data)
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data)
   {
       return APR_ENOTIMPL;
   }
   
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, apr_off_t point)
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, apr_off_t point)
   {
       return APR_ENOTIMPL;
   }
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_notimpl(ap_bucket *e, ap_bucket **c)
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_notimpl(ap_bucket *e, ap_bucket **c)
   {
       return APR_ENOTIMPL;
   }
  -APR_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data)
  +APU_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data)
   {
       return;
   }
  
  
  
  1.17      +3 -3      apr-util/src/buckets/ap_buckets_eos.c
  
  Index: ap_buckets_eos.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_eos.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ap_buckets_eos.c	2000/12/08 11:02:33	1.16
  +++ ap_buckets_eos.c	2000/12/21 18:06:15	1.17
  @@ -69,7 +69,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b)
  +APU_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b)
   {
       b->length    = 0;
       b->data      = NULL;
  @@ -79,12 +79,12 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_eos(void)
  +APU_DECLARE(ap_bucket *) ap_bucket_create_eos(void)
   {
       ap_bucket_do_create(ap_bucket_make_eos(b));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_eos_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_eos_type = {
       "EOS", 5,
       ap_bucket_destroy_notimpl,
       eos_read,
  
  
  
  1.15      +3 -3      apr-util/src/buckets/ap_buckets_file.c
  
  Index: ap_buckets_file.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_file.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_buckets_file.c	2000/12/08 11:02:34	1.14
  +++ ap_buckets_file.c	2000/12/21 18:06:15	1.15
  @@ -160,7 +160,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd,
  +APU_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;
  @@ -180,13 +180,13 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd,
  +APU_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));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_file_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_file_type = {
       "FILE", 5,
       ap_bucket_destroy_notimpl,
       file_read,
  
  
  
  1.9       +3 -3      apr-util/src/buckets/ap_buckets_flush.c
  
  Index: ap_buckets_flush.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_flush.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap_buckets_flush.c	2000/12/08 11:02:34	1.8
  +++ ap_buckets_flush.c	2000/12/21 18:06:15	1.9
  @@ -69,7 +69,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b)
  +APU_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b)
   {
       b->length    = 0;
       b->data      = NULL;
  @@ -79,12 +79,12 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_flush(void)
  +APU_DECLARE(ap_bucket *) ap_bucket_create_flush(void)
   {
       ap_bucket_do_create(ap_bucket_make_flush(b));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_flush_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_flush_type = {
       "FLUSH", 5,
       ap_bucket_destroy_notimpl,
       flush_read,
  
  
  
  1.20      +3 -3      apr-util/src/buckets/ap_buckets_heap.c
  
  Index: ap_buckets_heap.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_heap.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ap_buckets_heap.c	2000/12/08 11:02:35	1.19
  +++ ap_buckets_heap.c	2000/12/21 18:06:15	1.20
  @@ -87,7 +87,7 @@
       free(h);
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
   		const char *buf, apr_size_t length, int copy, apr_size_t *w)
   {
       ap_bucket_heap *h;
  @@ -134,13 +134,13 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_heap(
  +APU_DECLARE(ap_bucket *) ap_bucket_create_heap(
   		const char *buf, apr_size_t length, int copy, apr_size_t *w)
   {
       ap_bucket_do_create(ap_bucket_make_heap(b, buf, length, copy, w));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_heap_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_heap_type = {
       "HEAP", 5,
       heap_destroy,
       heap_read,
  
  
  
  1.24      +3 -3      apr-util/src/buckets/ap_buckets_mmap.c
  
  Index: ap_buckets_mmap.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_mmap.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ap_buckets_mmap.c	2000/12/08 11:02:36	1.23
  +++ ap_buckets_mmap.c	2000/12/21 18:06:15	1.24
  @@ -86,7 +86,7 @@
   /*
    * XXX: are the start and length arguments useful?
    */
  -APR_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
  +APU_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;
  @@ -109,13 +109,13 @@
   }
   
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_mmap(
  +APU_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));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_mmap_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_mmap_type = {
       "MMAP", 5,
       mmap_destroy,
       mmap_read,
  
  
  
  1.24      +3 -3      apr-util/src/buckets/ap_buckets_pipe.c
  
  Index: ap_buckets_pipe.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_pipe.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ap_buckets_pipe.c	2000/12/08 11:02:37	1.23
  +++ ap_buckets_pipe.c	2000/12/21 18:06:15	1.24
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *p)
  +APU_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *p)
   {
       /*
        * A pipe is closed when the end is reached in pipe_read().  If the
  @@ -134,12 +134,12 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *p)
  +APU_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_pipe(b, p));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_pipe_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_pipe_type = {
       "PIPE", 5,
       ap_bucket_destroy_notimpl,
       pipe_read,
  
  
  
  1.8       +3 -3      apr-util/src/buckets/ap_buckets_pool.c
  
  Index: ap_buckets_pool.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_pool.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ap_buckets_pool.c	2000/12/08 11:02:38	1.7
  +++ ap_buckets_pool.c	2000/12/21 18:06:15	1.8
  @@ -97,7 +97,7 @@
       free(h);
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
   		const char *buf, apr_size_t length, apr_pool_t *p)
   {
       ap_bucket_pool *h;
  @@ -126,13 +126,13 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_pool(
  +APU_DECLARE(ap_bucket *) ap_bucket_create_pool(
   		const char *buf, apr_size_t length, apr_pool_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_pool(b, buf, length, p));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_pool_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_pool_type = {
       "POOL", 5,
       pool_destroy,
       pool_read,
  
  
  
  1.11      +4 -4      apr-util/src/buckets/ap_buckets_refcount.c
  
  Index: ap_buckets_refcount.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_refcount.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap_buckets_refcount.c	2000/12/08 16:10:31	1.10
  +++ ap_buckets_refcount.c	2000/12/21 18:06:15	1.11
  @@ -58,7 +58,7 @@
   
   #include "ap_buckets.h"
   
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *a, apr_off_t point)
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *a, apr_off_t point)
   {
       ap_bucket *b;
       ap_bucket_shared *ad, *bd;
  @@ -86,7 +86,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c)
  +APU_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c)
   {
       ap_bucket *b;
       ap_bucket_shared *ad, *bd;
  @@ -114,7 +114,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(void *) ap_bucket_destroy_shared(void *data)
  +APU_DECLARE(void *) ap_bucket_destroy_shared(void *data)
   {
       ap_bucket_shared *s = data;
       ap_bucket_refcount *r = s->data;
  @@ -129,7 +129,7 @@
       }
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
  +APU_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.17      +5 -5      apr-util/src/buckets/ap_buckets_simple.c
  
  Index: ap_buckets_simple.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_simple.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ap_buckets_simple.c	2000/12/08 11:02:39	1.16
  +++ ap_buckets_simple.c	2000/12/21 18:06:15	1.17
  @@ -120,7 +120,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  +APU_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
   		const char *buf, apr_size_t length)
   {
       ap_bucket_simple *bd;
  @@ -140,7 +140,7 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_immortal(
  +APU_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));
  @@ -173,7 +173,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  +APU_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);
  @@ -184,7 +184,7 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_transient(
  +APU_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));
  @@ -199,7 +199,7 @@
       simple_copy
   };
   
  -APR_DECLARE_DATA const ap_bucket_type ap_transient_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_transient_type = {
       "TRANSIENT", 5,
       ap_bucket_destroy_notimpl, 
       simple_read,
  
  
  
  1.13      +3 -3      apr-util/src/buckets/ap_buckets_socket.c
  
  Index: ap_buckets_socket.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_socket.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ap_buckets_socket.c	2000/12/08 11:02:39	1.12
  +++ ap_buckets_socket.c	2000/12/21 18:06:15	1.13
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *p)
  +APU_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
  @@ -129,12 +129,12 @@
       return b;
   }
   
  -APR_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *p)
  +APU_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_socket(b, p));
   }
   
  -APR_DECLARE_DATA const ap_bucket_type ap_socket_type = {
  +APU_DECLARE_DATA const ap_bucket_type ap_socket_type = {
       "SOCKET", 5,
       ap_bucket_destroy_notimpl,
       socket_read,
  
  
  
  1.20      +6 -6      apr-util/src/crypto/ap_sha1.c
  
  Index: ap_sha1.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/crypto/ap_sha1.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ap_sha1.c	2000/12/20 16:22:32	1.19
  +++ ap_sha1.c	2000/12/21 18:06:17	1.20
  @@ -122,7 +122,7 @@
   #if APR_CHARSET_EBCDIC
   static apr_xlate_t *ebcdic2ascii_xlate;
   
  -APR_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x)
  +APU_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x)
   {
       apr_status_t rv;
       int onoff;
  @@ -243,7 +243,7 @@
   
   /* initialize the SHA digest */
   
  -APR_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info)
  +APU_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 */
   
  -APR_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info,
  +APU_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;
   }
   
  -APR_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf,
  +APU_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf,
                                 unsigned int count)
   {
   #if APR_CHARSET_EBCDIC
  @@ -350,7 +350,7 @@
   
   /* finish computing the SHA digest */
   
  -APR_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
  +APU_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
                                AP_SHA1_CTX *sha_info)
   {
       int count, i, j;
  @@ -385,7 +385,7 @@
   }
   
   
  -APR_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out)
  +APU_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out)
   {
       int l;
       AP_SHA1_CTX context;
  
  
  
  1.18      +7 -7      apr-util/src/encoding/ap_base64.c
  
  Index: ap_base64.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/encoding/ap_base64.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ap_base64.c	2000/12/20 16:22:34	1.17
  +++ ap_base64.c	2000/12/21 18:06:18	1.18
  @@ -113,7 +113,7 @@
   static apr_xlate_t *xlate_to_ebcdic;
   static unsigned char os_toascii[256];
   
  -APR_DECLARE(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii,
  +APU_DECLARE(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii,
                                                apr_xlate_t *to_ebcdic)
   {
       int i;
  @@ -149,7 +149,7 @@
   }
   #endif /*APR_CHARSET_EBCDIC*/
   
  -APR_DECLARE(int) ap_base64decode_len(const char *bufcoded)
  +APU_DECLARE(int) ap_base64decode_len(const char *bufcoded)
   {
       int nbytesdecoded;
       register const unsigned char *bufin;
  @@ -164,7 +164,7 @@
       return nbytesdecoded + 1;
   }
   
  -APR_DECLARE(int) ap_base64decode(char *bufplain, const char *bufcoded)
  +APU_DECLARE(int) ap_base64decode(char *bufplain, const char *bufcoded)
   {
   #if APR_CHARSET_EBCDIC
       apr_size_t inbytes_left, outbytes_left;
  @@ -184,7 +184,7 @@
   /* This is the same as ap_base64decode() except on EBCDIC machines, where
    * the conversion of the output to ebcdic is left out.
    */
  -APR_DECLARE(int) ap_base64decode_binary(unsigned char *bufplain,
  +APU_DECLARE(int) ap_base64decode_binary(unsigned char *bufplain,
   				   const char *bufcoded)
   {
       int nbytesdecoded;
  @@ -232,12 +232,12 @@
   static const char basis_64[] =
       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   
  -APR_DECLARE(int) ap_base64encode_len(int len)
  +APU_DECLARE(int) ap_base64encode_len(int len)
   {
       return ((len + 2) / 3 * 4) + 1;
   }
   
  -APR_DECLARE(int) ap_base64encode(char *encoded, const char *string, int len)
  +APU_DECLARE(int) ap_base64encode(char *encoded, const char *string, int len)
   {
   #if !APR_CHARSET_EBCDIC
       return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
  @@ -276,7 +276,7 @@
   /* This is the same as ap_base64encode() except on EBCDIC machines, where
    * the conversion of the input to ascii is left out.
    */
  -APR_DECLARE(int) ap_base64encode_binary(char *encoded,
  +APU_DECLARE(int) ap_base64encode_binary(char *encoded,
                                         const unsigned char *string, int len)
   {
       int i;
  
  
  
  1.24      +7 -7      apr-util/src/hooks/ap_hooks.c
  
  Index: ap_hooks.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/hooks/ap_hooks.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ap_hooks.c	2000/12/05 04:46:24	1.23
  +++ ap_hooks.c	2000/12/21 18:06:18	1.24
  @@ -66,9 +66,9 @@
   #define apr_palloc(pool,size)	malloc(size)
   #endif
   
  -APR_DECLARE_DATA apr_pool_t *ap_global_hook_pool = NULL;
  -APR_DECLARE_DATA int ap_debug_module_hooks = 0;
  -APR_DECLARE_DATA const char *ap_debug_module_name = NULL;
  +APU_DECLARE_DATA apr_pool_t *ap_global_hook_pool = NULL;
  +APU_DECLARE_DATA int ap_debug_module_hooks = 0;
  +APU_DECLARE_DATA const char *ap_debug_module_name = NULL;
   
   /* NB: This must echo the LINK_##name structure */
   typedef struct
  @@ -208,7 +208,7 @@
       apr_array_header_t **paHooks;
   } HookSortEntry;
   
  -APR_DECLARE(void) ap_hook_sort_register(const char *szHookName,
  +APU_DECLARE(void) ap_hook_sort_register(const char *szHookName,
                                         apr_array_header_t **paHooks)
   {
       HookSortEntry *pEntry;
  @@ -220,7 +220,7 @@
       pEntry->paHooks=paHooks;
   }
   
  -APR_DECLARE(void) ap_sort_hooks()
  +APU_DECLARE(void) ap_sort_hooks()
   {
       int n;
   
  @@ -230,7 +230,7 @@
       }
   }
       
  -APR_DECLARE(void) ap_hook_deregister_all(void)
  +APU_DECLARE(void) ap_hook_deregister_all(void)
   {
       int n;    
   
  @@ -241,7 +241,7 @@
       s_aHooksToSort=NULL;
   }
   
  -APR_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
  +APU_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
   		             const char * const *aszSucc)
   {
       int nFirst;
  
  
  

Mime
View raw message