From 10471aa29b26b4354c41e043563aa56a2d293f0f Mon Sep 17 00:00:00 2001 From: Justin Maggard Date: Fri, 7 Mar 2014 13:20:26 -0800 Subject: [PATCH] portability: fix compiling on systems without iconv --- tagutils/tagutils-misc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tagutils/tagutils-misc.c b/tagutils/tagutils-misc.c index fbc09df..7eb8bba 100644 --- a/tagutils/tagutils-misc.c +++ b/tagutils/tagutils-misc.c @@ -31,12 +31,12 @@ typedef enum { ICONV_FATAL } iconv_result; +#ifdef HAVE_ICONV static iconv_result do_iconv(const char* to_ces, const char* from_ces, ICONV_CONST char *inbuf, size_t inbytesleft, char *outbuf_orig, size_t outbytesleft_orig) { -#ifdef HAVE_ICONV size_t rc; iconv_result ret = ICONV_OK; @@ -65,10 +65,16 @@ do_iconv(const char* to_ces, const char* from_ces, iconv_close(cd); return ret; -#else // HAVE_ICONV - return ICONV_FATAL; -#endif // HAVE_ICONV } +#else // HAVE_ICONV +static iconv_result +do_iconv(const char* to_ces, const char* from_ces, + char *inbuf, size_t inbytesleft, + char *outbuf_orig, size_t outbytesleft_orig) +{ + return ICONV_FATAL; +} +#endif // HAVE_ICONV #define N_LANG_ALT 8 struct {