diff options
| author | Jeff Trawick <trawick@apache.org> | 2003-11-26 03:09:25 +0100 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2003-11-26 03:09:25 +0100 |
| commit | 1dc6636640d9da366889f6017b2f873cdc8bd38c (patch) | |
| tree | 15cd6c4ead1c866284695aa04dce115e46eb8f48 /include | |
| parent | Sync with APACHE_2_0_BRANCH. (diff) | |
| download | apache2-1dc6636640d9da366889f6017b2f873cdc8bd38c.tar.xz apache2-1dc6636640d9da366889f6017b2f873cdc8bd38c.zip | |
tidy up some charset recoding issues
the "need" for APACHE_XLATE went away some years ago when BUFF went
POOF and charset recoding (translation) of non-protocol data
could no longer be performed by the core...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101894 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_config.h | 4 | ||||
| -rw-r--r-- | include/util_charset.h | 18 |
2 files changed, 6 insertions, 16 deletions
diff --git a/include/ap_config.h b/include/ap_config.h index 86ec5dc224..a951d0fbd5 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -284,8 +284,4 @@ #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE #endif -#if APR_CHARSET_EBCDIC && !defined(APACHE_XLATE) -#define APACHE_XLATE -#endif - #endif /* AP_CONFIG_H */ diff --git a/include/util_charset.h b/include/util_charset.h index ae4608cc96..fb7f889f9e 100644 --- a/include/util_charset.h +++ b/include/util_charset.h @@ -59,8 +59,6 @@ #ifndef APACHE_UTIL_CHARSET_H #define APACHE_UTIL_CHARSET_H -#ifdef APACHE_XLATE - #ifdef __cplusplus extern "C" { #endif @@ -68,6 +66,10 @@ extern "C" { /** * @package charset conversion */ +#include "apr.h" + +#if APR_CHARSET_EBCDIC + #include "apr_xlate.h" /** On EBCDIC machine this is a translation handle used to translate the @@ -78,19 +80,11 @@ extern apr_xlate_t *ap_hdrs_to_ascii; * headers from ASCII to the local machine format after network transmission. * On an ASCII machine this is NULL */ extern apr_xlate_t *ap_hdrs_from_ascii; -/** On EBCDIC machine this is a translation handle used to translate the - * content from the local machine format to ASCII for network transmission. - * On an ASCII machine this is NULL */ -extern apr_xlate_t *ap_locale_to_ascii; -/** On EBCDIC machine this is a translation handle used to translate the - * content from ASCII to the local machine format after network transmission. - * On an ASCII machine this is NULL */ -extern apr_xlate_t *ap_locale_from_ascii; +#endif /* APR_CHARSET_EBCDIC */ + #ifdef __cplusplus } #endif -#endif /* APACHE_XLATE */ - #endif /* !APACHE_UTIL_CHARSET_H */ |