summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2002-06-24 02:07:28 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2002-06-24 02:07:28 +0000
commitbd87926f4550ad609ac810f7bf23dec80b1b6ac5 (patch)
tree9379bfee8fe72fba7e4d5bf59e68acb46b1c6ac3
parent6760920a4d9dbeabee187c08e3d4f6ce95f1ca7f (diff)
downloadlibapr-bd87926f4550ad609ac810f7bf23dec80b1b6ac5.tar.gz
Already exported on unix, we need this exported to write WinNT accessors
for objects such as services and the registry that have no apr-izable concept for any other platforms. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63519 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--i18n/unix/utf8_ucs2.c12
-rw-r--r--include/arch/unix/i18n.h12
2 files changed, 16 insertions, 8 deletions
diff --git a/i18n/unix/utf8_ucs2.c b/i18n/unix/utf8_ucs2.c
index 568da5a6d..3b9a5ec46 100644
--- a/i18n/unix/utf8_ucs2.c
+++ b/i18n/unix/utf8_ucs2.c
@@ -98,8 +98,10 @@
* apr_conv_ucs2_to_utf8 out words:sizeof(in) / 2 <= Req <= sizeof(in) * 3 / 2
*/
-apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
- apr_wchar_t *out, apr_size_t *outwords)
+APR_DECLARE(apr_status_t) apr_conv_utf8_to_ucs2(const char *in,
+ apr_size_t *inbytes,
+ apr_wchar_t *out,
+ apr_size_t *outwords)
{
apr_int64_t newch, mask;
apr_size_t expect, eating;
@@ -207,8 +209,10 @@ apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
return APR_SUCCESS;
}
-apr_status_t apr_conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
- char *out, apr_size_t *outbytes)
+APR_DECLARE(apr_status_t) apr_conv_ucs2_to_utf8(const apr_wchar_t *in,
+ apr_size_t *inwords,
+ char *out,
+ apr_size_t *outbytes)
{
apr_int64_t newch, require;
apr_size_t need;
diff --git a/include/arch/unix/i18n.h b/include/arch/unix/i18n.h
index 81820c7c5..5273e0095 100644
--- a/include/arch/unix/i18n.h
+++ b/include/arch/unix/i18n.h
@@ -71,8 +71,10 @@ typedef apr_uint16_t apr_wchar_t;
* when the character code is invalid (in or out of context) and the later
* when more characters were expected, but insufficient characters remain.
*/
-apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
- apr_wchar_t *out, apr_size_t *outwords);
+APR_DECLARE(apr_status_t) apr_conv_utf8_to_ucs2(const char *in,
+ apr_size_t *inbytes,
+ apr_wchar_t *out,
+ apr_size_t *outwords);
/**
* An APR internal function for fast ucs-2 wide Unicode format conversion to
@@ -83,7 +85,9 @@ apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
* when the character code is invalid (in or out of context) and the later
* when more words were expected, but insufficient words remain.
*/
-apr_status_t apr_conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
- char *out, apr_size_t *outbytes);
+APR_DECLARE(apr_status_t) apr_conv_ucs2_to_utf8(const apr_wchar_t *in,
+ apr_size_t *inwords,
+ char *out,
+ apr_size_t *outbytes);
#endif /* def I18N_H */