aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-09-09 18:41:17 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-09-11 15:18:30 (GMT)
commitb9e9eb4e44a30204f719c40edd792f35305af932 (patch)
treea85bb490690ebc2aa92249632b6016fe40bfabd3
parentf9df3ffedafe4ee36a74949958527ecc0c23c841 (diff)
downloadfluxbox_pavel-b9e9eb4e44a30204f719c40edd792f35305af932.zip
fluxbox_pavel-b9e9eb4e44a30204f719c40edd792f35305af932.tar.bz2
FbString: fix build without iconv
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>
-rw-r--r--src/FbTk/FbString.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index fd34693..5295a66 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -150,6 +150,7 @@ enum ConvType { FB2X = 0, X2FB, LOCALE2FB, FB2LOCALE, CONVSIZE };
150#ifdef HAVE_ICONV 150#ifdef HAVE_ICONV
151static iconv_t *iconv_convs = 0; 151static iconv_t *iconv_convs = 0;
152#else 152#else
153typedef int iconv_t;
153static int iconv_convs[CONVSIZE]; 154static int iconv_convs[CONVSIZE];
154#endif // HAVE_ICONV 155#endif // HAVE_ICONV
155 156
@@ -292,7 +293,7 @@ string recode(iconv_t cd, const string &in) {
292 293
293 return ret; 294 return ret;
294#else 295#else
295 return str; 296 return in;
296#endif // HAVE_ICONV 297#endif // HAVE_ICONV
297} 298}
298 299