all repos — fluxbox @ b9e9eb4e44a30204f719c40edd792f35305af932

custom fork of the fluxbox windowmanager 

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>
Peter Korsgaard jacmet@sunsite.dk
commit

b9e9eb4e44a30204f719c40edd792f35305af932

parent

f9df3ffedafe4ee36a74949958527ecc0c23c841

1 files changed, 2 insertions(+), 1 deletions(-)

jump to
M src/FbTk/FbString.cc → src/FbTk/FbString.cc 
@@ -150,6 +150,7 @@ 
 #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 @@ free(out);
 
     return ret;
 #else
-    return str;
+    return in;
 #endif // HAVE_ICONV
 }