From 0ae8baf47b5d444a84a243dce9ac1d73cd5be733 Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Sun, 7 Jul 2013 09:52:35 +0000 Subject: Added DISABLE_ICONV --- src/htscharset.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') diff --git a/src/htscharset.c b/src/htscharset.c index 5dd58ad..2cc79f0 100644 --- a/src/htscharset.c +++ b/src/htscharset.c @@ -373,7 +373,14 @@ char *hts_convertStringSystemToUTF8(const char *s, size_t size) { #else #include + +#if ( defined(HTS_USEICONV) && ( HTS_USEICONV == 0 ) ) +#define DISABLE_ICONV +#endif + +#ifndef DISABLE_ICONV #include +#endif static char *hts_convertStringToUTF8_(const char *s, size_t size, const char *to, const char *from) { @@ -385,6 +392,7 @@ static char *hts_convertStringToUTF8_(const char *s, size_t size, if (strcasecmp(from, to) == 0) { return strndup(s, size); } +#ifndef DISABLE_ICONV /* Find codepage */ else { const iconv_t cp = iconv_open(to, from); @@ -443,6 +451,7 @@ static char *hts_convertStringToUTF8_(const char *s, size_t size, return outbuf; } } +#endif /* Error, charset not found! */ return NULL; -- cgit v1.2.3