diff options
| author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-12-19 17:05:36 +0000 |
|---|---|---|
| committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-12-19 17:05:36 +0000 |
| commit | 72c2efe4ee5c5ae53b7011c0cbe250d324c36581 (patch) | |
| tree | 92805be9f4ea8019f76847c68a3664e1d40a6bf1 /passwd | |
| parent | 7d8f420cce6e72c14cee7807b4a740d11cecb688 (diff) | |
| download | libapr-72c2efe4ee5c5ae53b7011c0cbe250d324c36581.tar.gz | |
Force all Apache functions to be linked into the executable, whether they
are used or not. This uses the same mechanism that is used for APR
and APR-util. This may not be the correct solution, but it works, and that
is what I really care about. This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC. This is for namespace correctness, but it also makes
the exports script a bit easier.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60970 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 6019c7716..e9ecde9e5 100644 --- a/passwd/apr_getpass.c +++ b/passwd/apr_getpass.c @@ -78,13 +78,13 @@ #include <termios.h> #endif -#ifndef CHARSET_EBCDIC +#ifndef AP_CHARSET_EBCDIC #define LF 10 #define CR 13 -#else /* CHARSET_EBCDIC */ +#else /* AP_CHARSET_EBCDIC */ #define LF '\n' #define CR '\r' -#endif /* CHARSET_EBCDIC */ +#endif /* AP_CHARSET_EBCDIC */ #define MAX_STRING_LEN 256 diff --git a/passwd/apr_md5.c b/passwd/apr_md5.c index 30ca92183..a6cd62c9e 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 CHARSET_EBCDIC +#ifdef AP_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 CHARSET_EBCDIC +#ifdef AP_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 CHARSET_EBCDIC +#ifdef AP_CHARSET_EBCDIC apr_MD5SetXlate(&ctx, xlate_ebcdic_to_ascii); #endif |