all repos — fluxbox @ 1c2edb9a01817fbac169e12f14944e8676c013dc

custom fork of the fluxbox windowmanager

final fix for iconv-issues on sun/sparcs
akir akir
commit

1c2edb9a01817fbac169e12f14944e8676c013dc

parent

0c5dae0b4546da182cac520e21c94cfbc5bc1f3f

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

jump to
M src/FbTk/Font.ccsrc/FbTk/Font.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -//$Id: Font.cc,v 1.18 2004/08/31 23:07:58 akir Exp $ +//$Id: Font.cc,v 1.19 2004/09/01 00:09:03 akir Exp $ #include "StringUtil.hh"

@@ -122,7 +122,7 @@ char *orig_msg_ptr = msg_ptr; // msg_ptr modified in iconv call

size_t result = (size_t)(-1); #ifdef HAVE_CONST_ICONV - result = iconv(cd, const_cast<char **>(&msg_ptr), &inbytesleft, &new_msg, &outbytesleft); + result = iconv(cd, (const char**)(&msg_ptr), &inbytesleft, &new_msg, &outbytesleft); #else result = iconv(cd, &msg_ptr, &inbytesleft, &new_msg, &outbytesleft); #endif // HAVE_CONST_ICONV