diff options
author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2000-05-27 04:23:25 +0000 |
---|---|---|
committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2000-05-27 04:23:25 +0000 |
commit | ff0d1c040f6cc33f0a410254a4aba68d5debbcbf (patch) | |
tree | 07d4a46cf36829fe25abe8f31982a7b415220b36 /encoding | |
parent | 19b06c29e913b4ba9061e98332698836decd39b5 (diff) | |
download | libapr-util-ff0d1c040f6cc33f0a410254a4aba68d5debbcbf.tar.gz |
ap.h is the basis for the ap.lib collection. Since it is a distinct
package, this patch provides appropriate Win32 linkage resolution for
its functions and data.
The most significant change is in the ap_hooks.h declaration macros.
These now require a first parameter of the linkage to be used. There
is no shared data, so only the hook-in and hook-run functions are
affected. Use the appropriate function export without the parens,
for the core server this will be API_EXPORT (no variable args, and the
functions are exported from the core server.)
The patch to correct the resulting issues in the server core follows
seperately.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@57805 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'encoding')
-rw-r--r-- | encoding/ap_base64.c | 16 | ||||
-rw-r--r-- | encoding/apr_base64.c | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/encoding/ap_base64.c b/encoding/ap_base64.c index b68f5cd9..f1e1469b 100644 --- a/encoding/ap_base64.c +++ b/encoding/ap_base64.c @@ -114,7 +114,7 @@ static const unsigned char pr2six[256] = static ap_xlate_t *xlate_to_ebcdic; static unsigned char os_toascii[256]; -API_EXPORT(ap_status_t) ap_base64init_ebcdic(ap_xlate_t *to_ascii, +AP_EXPORT(ap_status_t) ap_base64init_ebcdic(ap_xlate_t *to_ascii, ap_xlate_t *to_ebcdic) { int i; @@ -150,7 +150,7 @@ API_EXPORT(ap_status_t) ap_base64init_ebcdic(ap_xlate_t *to_ascii, } #endif /*CHARSET_EBCDIC*/ -API_EXPORT(int) ap_base64decode_len(const char *bufcoded) +AP_EXPORT(int) ap_base64decode_len(const char *bufcoded) { int nbytesdecoded; register const unsigned char *bufin; @@ -165,7 +165,7 @@ API_EXPORT(int) ap_base64decode_len(const char *bufcoded) return nbytesdecoded + 1; } -API_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded) +AP_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded) { #ifdef CHARSET_EBCDIC ap_size_t inbytes_left, outbytes_left; @@ -185,7 +185,7 @@ API_EXPORT(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. */ -API_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain, +AP_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain, const char *bufcoded) { int nbytesdecoded; @@ -233,12 +233,12 @@ API_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain, static const char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -API_EXPORT(int) ap_base64encode_len(int len) +AP_EXPORT(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_EXPORT(int) ap_base64encode(char *encoded, const char *string, int len) { #ifndef CHARSET_EBCDIC return ap_base64encode_binary(encoded, (const unsigned char *) string, len); @@ -277,8 +277,8 @@ API_EXPORT(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. */ -API_EXPORT(int) ap_base64encode_binary(char *encoded, - const unsigned char *string, int len) +AP_EXPORT(int) ap_base64encode_binary(char *encoded, + const unsigned char *string, int len) { int i; char *p; diff --git a/encoding/apr_base64.c b/encoding/apr_base64.c index b68f5cd9..f1e1469b 100644 --- a/encoding/apr_base64.c +++ b/encoding/apr_base64.c @@ -114,7 +114,7 @@ static const unsigned char pr2six[256] = static ap_xlate_t *xlate_to_ebcdic; static unsigned char os_toascii[256]; -API_EXPORT(ap_status_t) ap_base64init_ebcdic(ap_xlate_t *to_ascii, +AP_EXPORT(ap_status_t) ap_base64init_ebcdic(ap_xlate_t *to_ascii, ap_xlate_t *to_ebcdic) { int i; @@ -150,7 +150,7 @@ API_EXPORT(ap_status_t) ap_base64init_ebcdic(ap_xlate_t *to_ascii, } #endif /*CHARSET_EBCDIC*/ -API_EXPORT(int) ap_base64decode_len(const char *bufcoded) +AP_EXPORT(int) ap_base64decode_len(const char *bufcoded) { int nbytesdecoded; register const unsigned char *bufin; @@ -165,7 +165,7 @@ API_EXPORT(int) ap_base64decode_len(const char *bufcoded) return nbytesdecoded + 1; } -API_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded) +AP_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded) { #ifdef CHARSET_EBCDIC ap_size_t inbytes_left, outbytes_left; @@ -185,7 +185,7 @@ API_EXPORT(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. */ -API_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain, +AP_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain, const char *bufcoded) { int nbytesdecoded; @@ -233,12 +233,12 @@ API_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain, static const char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -API_EXPORT(int) ap_base64encode_len(int len) +AP_EXPORT(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_EXPORT(int) ap_base64encode(char *encoded, const char *string, int len) { #ifndef CHARSET_EBCDIC return ap_base64encode_binary(encoded, (const unsigned char *) string, len); @@ -277,8 +277,8 @@ API_EXPORT(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. */ -API_EXPORT(int) ap_base64encode_binary(char *encoded, - const unsigned char *string, int len) +AP_EXPORT(int) ap_base64encode_binary(char *encoded, + const unsigned char *string, int len) { int i; char *p; |