jorton 2004/06/25 08:34:28
Modified: xlate xlate.c
Log:
As per 0.9 branch:
* xlate/xlate.c (check_sbcs): Fix build breakage on APR_HAVE_APR_ICONV
path.
Submitted by: Bill Stoddard
Revision Changes Path
1.22 +4 -3 apr-util/xlate/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apr-util/xlate/xlate.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -d -w -u -r1.21 -r1.22
--- xlate.c 6 Jun 2004 10:07:07 -0000 1.21
+++ xlate.c 25 Jun 2004 15:34:28 -0000 1.22
@@ -178,8 +178,9 @@
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 */
|