diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2020-09-05 05:15:52 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2020-09-05 05:15:52 +0000 |
| commit | 777acc63312de2b4d9eef6183c09957a5c4e9e06 (patch) | |
| tree | 6c22b2b22bc812f7d95a94eb98aa18355e3c84c2 /include | |
| parent | 6d3091f16629fba3d77dfe5a40d630f21e366a9b (diff) | |
| download | apr-777acc63312de2b4d9eef6183c09957a5c4e9e06.tar.gz | |
Restore deprecated function names for httpd and tcnative
- apr_conv_utf8_to_ucs2 and apr_conv_ucs2_to_utf8 functions are used by
both httpd and the tomcat tcnative connector
- if ever exposed as public and platform agnostic, the archaic 'ucs2' forms
should be dropped at that time
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1881476 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/arch/win32/apr_arch_utf8.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/arch/win32/apr_arch_utf8.h b/include/arch/win32/apr_arch_utf8.h index 424c9a295..aa7c52e2f 100644 --- a/include/arch/win32/apr_arch_utf8.h +++ b/include/arch/win32/apr_arch_utf8.h @@ -41,6 +41,11 @@ APR_DECLARE(apr_status_t) apr_conv_utf8_to_utf16(const char *in, apr_size_t *outwords); /** + * @deprecated @see apr_conv_utf8_to_utf16 + */ +#define apr_conv_utf8_to_ucs2(in, inbytes, out, outwords) apr_conv_utf8_to_utf16(in, inbytes, out, outwords) + +/** * An APR internal function for fast utf-16 Unicode including surrogate pairs * format conversion to the utf-8 octet-encoded Unicode. This function is used * for filename and other resource conversions for platforms providing native @@ -55,4 +60,9 @@ APR_DECLARE(apr_status_t) apr_conv_utf16_to_utf8(const apr_wchar_t *in, char *out, apr_size_t *outbytes); +/** + * @deprecated @see apr_conv_utf16_to_utf8 + */ +#define apr_conv_ucs2_to_utf8(in, inwords, out, outbytes) apr_conv_utf16_to_utf8(in, inwords, out, outbytes) + #endif /* def UTF8_H */ |