diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-12-20 16:20:18 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-12-20 16:20:18 +0000 |
| commit | ef54d862a471f7d7fca398eb2f69b31807443376 (patch) | |
| tree | 9fcff265caade07ecd8f6967f2746155ac4237a9 /passwd | |
| parent | bd6b25fd25142df2575c8af582e58ad47eb78420 (diff) | |
| download | libapr-ef54d862a471f7d7fca398eb2f69b31807443376.tar.gz | |
Instead of a private AP_CHARSET_EBCDIC which is only defined on
an EBCDIC machine, define APR_CHARSET_EBCDIC to 0 or 1 for all
the world to see and use it as appropriate in APR.
I removed the TPF and BS2000 stuff. If configure doesn't work there
they need to provide a custom apr.h anyway.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60972 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'passwd')
| -rw-r--r-- | passwd/apr_getpass.c | 6 | ||||
| -rw-r--r-- | passwd/apr_md5.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/passwd/apr_getpass.c b/passwd/apr_getpass.c index e9ecde9e5..c0a716c5f 100644 --- a/passwd/apr_getpass.c +++ b/passwd/apr_getpass.c @@ -78,13 +78,13 @@ #include <termios.h> #endif -#ifndef AP_CHARSET_EBCDIC +#if !APR_CHARSET_EBCDIC #define LF 10 #define CR 13 -#else /* AP_CHARSET_EBCDIC */ +#else /* APR_CHARSET_EBCDIC */ #define LF '\n' #define CR '\r' -#endif /* AP_CHARSET_EBCDIC */ +#endif /* APR_CHARSET_EBCDIC */ #define MAX_STRING_LEN 256 diff --git a/passwd/apr_md5.c b/passwd/apr_md5.c index a6cd62c9e..81d90e26c 100644 --- a/passwd/apr_md5.c +++ b/passwd/apr_md5.c @@ -145,7 +145,7 @@ static unsigned char PADDING[64] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -#ifdef AP_CHARSET_EBCDIC +#if APR_CHARSET_EBCDIC static apr_xlate_t *xlate_ebcdic_to_ascii; /* used in apr_MD5Encode() */ #endif @@ -460,7 +460,7 @@ static void Decode(UINT4 *output, const unsigned char *input, unsigned int len) (((UINT4) input[j + 2]) << 16) | (((UINT4) input[j + 3]) << 24); } -#ifdef AP_CHARSET_EBCDIC +#if APR_CHARSET_EBCDIC APR_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate) { xlate_ebcdic_to_ascii = xlate; @@ -537,7 +537,7 @@ APR_DECLARE(apr_status_t) apr_MD5Encode(const char *pw, const char *salt, * 'Time to make the doughnuts..' */ apr_MD5Init(&ctx); -#ifdef AP_CHARSET_EBCDIC +#if APR_CHARSET_EBCDIC apr_MD5SetXlate(&ctx, xlate_ebcdic_to_ascii); #endif |