diff options
| author | Doug MacEachern <dougm@apache.org> | 2000-08-02 07:27:38 +0200 |
|---|---|---|
| committer | Doug MacEachern <dougm@apache.org> | 2000-08-02 07:27:38 +0200 |
| commit | 059d8dd2122f0a3948c2c09549159f0931a6f236 (patch) | |
| tree | 8a2937938ed4eec31f918c6c8401ce07012cd37a /include/util_charset.h | |
| parent | Use the AP_INIT_TAKE23() macro to clean up a maintainer-mode warning, (diff) | |
| download | apache2-059d8dd2122f0a3948c2c09549159f0931a6f236.tar.xz apache2-059d8dd2122f0a3948c2c09549159f0931a6f236.zip | |
prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/util_charset.h')
| -rw-r--r-- | include/util_charset.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/util_charset.h b/include/util_charset.h index 663ea66070..aae24b00ca 100644 --- a/include/util_charset.h +++ b/include/util_charset.h @@ -67,8 +67,8 @@ extern "C" { #include "apr_xlate.h" -extern ap_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii; -extern ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii; +extern apr_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii; +extern apr_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii; /* Save & Restore the current conversion settings * @@ -85,7 +85,7 @@ extern ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii; */ #define AP_PUSH_INPUTCONVERSION_STATE(_buff, _newx) \ - ap_xlate_t *saved_input_xlate; \ + apr_xlate_t *saved_input_xlate; \ ap_bgetopt(_buff, BO_RXLATE, &saved_input_xlate); \ ap_bsetopt(_buff, BO_RXLATE, &(_newx)) @@ -93,7 +93,7 @@ extern ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii; ap_bsetopt(_buff, BO_RXLATE, &saved_input_xlate) #define AP_PUSH_OUTPUTCONVERSION_STATE(_buff, _newx) \ - ap_xlate_t *saved_output_xlate; \ + apr_xlate_t *saved_output_xlate; \ ap_bgetopt(_buff, BO_WXLATE, &saved_output_xlate); \ ap_bsetopt(_buff, BO_WXLATE, &(_newx)) @@ -103,8 +103,8 @@ extern ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii; /* ap_set_content_xlate() is called by Apache core or a module to set * up character set translation (a.k.a. recoding) for content. */ -API_EXPORT(ap_status_t) ap_set_content_xlate(request_rec *r, int output, - ap_xlate_t *xlate); +API_EXPORT(apr_status_t) ap_set_content_xlate(request_rec *r, int output, + apr_xlate_t *xlate); #ifdef __cplusplus } |