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.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@58005 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 14 insertions, 14 deletions

diff --git a/encoding/ap_base64.c b/encoding/ap_base64.c
index 3eacca39..22568584 100644
--- a/encoding/ap_base64.c
+++ b/encoding/ap_base64.c
@@ -113,7 +113,7 @@ static const unsigned char pr2six[256] =
 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 @@ APR_DECLARE(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii,
 }
 #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 @@ APR_DECLARE(int) ap_base64decode_len(const char *bufcoded)
     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 @@ APR_DECLARE(int) ap_base64decode(char *bufplain, const char *bufcoded)
 /* 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 @@ APR_DECLARE(int) ap_base64decode_binary(unsigned char *bufplain,
 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 @@ APR_DECLARE(int) ap_base64encode(char *encoded, const char *string, int len)
 /* 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;
diff --git a/encoding/apr_base64.c b/encoding/apr_base64.c
index 3eacca39..22568584 100644
--- a/encoding/apr_base64.c
+++ b/encoding/apr_base64.c
@@ -113,7 +113,7 @@ static const unsigned char pr2six[256] =
 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 @@ APR_DECLARE(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii,
 }
 #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 @@ APR_DECLARE(int) ap_base64decode_len(const char *bufcoded)
     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 @@ APR_DECLARE(int) ap_base64decode(char *bufplain, const char *bufcoded)
 /* 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 @@ APR_DECLARE(int) ap_base64decode_binary(unsigned char *bufplain,
 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 @@ APR_DECLARE(int) ap_base64encode(char *encoded, const char *string, int len)
 /* 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;