summaryrefslogtreecommitdiff
path: root/xlate/xlate.c
diff options
context:
space:
mode:
authorjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2004-06-25 15:34:28 +0000
committerjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2004-06-25 15:34:28 +0000
commitb68a45c091d8613aad966363458612bfd18a528d (patch)
tree934eaf5e3484d57d1356182dd2343ef1812de3c0 /xlate/xlate.c
parent6f38319c6eee1324607ce0341596b792c2f442e6 (diff)
downloadlibapr-util-b68a45c091d8613aad966363458612bfd18a528d.tar.gz
As per 0.9 branch:
* xlate/xlate.c (check_sbcs): Fix build breakage on APR_HAVE_APR_ICONV path. Submitted by: Bill Stoddard git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@59079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'xlate/xlate.c')
-rw-r--r--xlate/xlate.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xlate/xlate.c b/xlate/xlate.c
index b75c15dd..4a4f6b5f 100644
--- a/xlate/xlate.c
+++ b/xlate/xlate.c
@@ -178,9 +178,10 @@ static void check_sbcs(apr_xlate_t *convset)
else {
/* reset the iconv descriptor, since it's now in an undefined
* state. */
- apr_iconv_close(convset->ich);
- convset->ich = apr_iconv_open(convset->topage, convset->frompage);
- }
+ apr_iconv_close(convset->ich, convset->pool);
+ rv = apr_iconv_open(convset->topage, convset->frompage,
+ convset->pool, &convset->ich);
+ }
}
#endif /* APU_HAVE_APR_ICONV */