-#if HAVE_ICONV_H
- if (zh->iconv_to_utf8 != (iconv_t) (-1))
- iconv_close (zh->iconv_to_utf8);
- if (zh->iconv_from_utf8 != (iconv_t) (-1))
- iconv_close (zh->iconv_from_utf8);
-#endif
+
+ if (zh->iconv_to_utf8 != 0)
+ yaz_iconv_close (zh->iconv_to_utf8);
+ if (zh->iconv_from_utf8 != 0)
+ yaz_iconv_close (zh->iconv_from_utf8);