mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-10-21 14:53:44 +03:00
encoding: Fix ICU build
This commit is contained in:
14
encoding.c
14
encoding.c
@@ -641,10 +641,6 @@ xmlNewCharEncodingHandler(const char *name,
|
|||||||
handler->iconv_in = NULL;
|
handler->iconv_in = NULL;
|
||||||
handler->iconv_out = NULL;
|
handler->iconv_out = NULL;
|
||||||
#endif
|
#endif
|
||||||
#ifdef LIBXML_ICU_ENABLED
|
|
||||||
handler->uconv_in = NULL;
|
|
||||||
handler->uconv_out = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* registers and returns the handler.
|
* registers and returns the handler.
|
||||||
@@ -1348,8 +1344,8 @@ xmlUconvFree(void *vctxt) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
xmlCharEncUconv(void *vctxt, const char *name, xmlCharEncConverter *conv) {
|
xmlCharEncUconv(void *vctxt ATTRIBUTE_UNUSED, const char *name,
|
||||||
xmlCharEncodingHandler *handler = vctxt;
|
xmlCharEncConverter *conv) {
|
||||||
xmlUconvCtxt *ucv_in = NULL;
|
xmlUconvCtxt *ucv_in = NULL;
|
||||||
xmlUconvCtxt *ucv_out = NULL;
|
xmlUconvCtxt *ucv_out = NULL;
|
||||||
int ret;
|
int ret;
|
||||||
@@ -1367,12 +1363,6 @@ xmlCharEncUconv(void *vctxt, const char *name, xmlCharEncConverter *conv) {
|
|||||||
conv->inputCtxt = ucv_in;
|
conv->inputCtxt = ucv_in;
|
||||||
conv->outputCtxt = ucv_out;
|
conv->outputCtxt = ucv_out;
|
||||||
|
|
||||||
/* Backward compatibility */
|
|
||||||
if (handler != NULL) {
|
|
||||||
handler->uconv_in = ucv_in;
|
|
||||||
handler->uconv_out = ucv_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
return(XML_ERR_OK);
|
return(XML_ERR_OK);
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
Reference in New Issue
Block a user