storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

portability: fix compiling on systems without iconv

Browse Source
This commit is contained in:
Justin Maggard 2014-03-07 13:20:26 -08:00
parent a606012d23
commit 10471aa29b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tagutils/tagutils-misc.c
View File

@ -31,12 +31,12 @@ typedef enum {
ICONV_FATAL ICONV_FATAL
} iconv_result; } iconv_result;
#ifdef HAVE_ICONV
static iconv_result static iconv_result
do_iconv(const char* to_ces, const char* from_ces, do_iconv(const char* to_ces, const char* from_ces,
ICONV_CONST char *inbuf, size_t inbytesleft, ICONV_CONST char *inbuf, size_t inbytesleft,
char *outbuf_orig, size_t outbytesleft_orig) char *outbuf_orig, size_t outbytesleft_orig)
{ {
#ifdef HAVE_ICONV
size_t rc; size_t rc;
iconv_result ret = ICONV_OK; iconv_result ret = ICONV_OK;
@ -65,10 +65,16 @@ do_iconv(const char* to_ces, const char* from_ces,
iconv_close(cd); iconv_close(cd);
return ret; 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 #define N_LANG_ALT 8
struct { struct {