nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FbString: fix build without iconv

Browse source 
Commit 690d926 (introduced FbTk::BidiString) broke building without
HAVE_ICONV, because of wrong variable name and use of iconv_t type.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-09-09 20:41:17 +02:00 committed by Mathias Gumz
parent f9df3ffeda
commit b9e9eb4e44
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/FbTk/FbString.cc
View file

@ -150,6 +150,7 @@ enum ConvType { FB2X = 0, X2FB, LOCALE2FB, FB2LOCALE, CONVSIZE };
#ifdef HAVE_ICONV
static iconv_t *iconv_convs = 0;
#else
typedef int iconv_t;
static int iconv_convs[CONVSIZE];
#endif // HAVE_ICONV
@ -292,7 +293,7 @@ string recode(iconv_t cd, const string &in) {
return ret;
#else
return str;
return in;
#endif // HAVE_ICONV
}