From c39c0718f99a58ff01821cc60777e3e1c7a31baa Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Mon, 24 Sep 2012 14:01:08 +0000 Subject: [PATCH] iconv() is a mess between os-es; const char**, char**,... oh my... --- pekwm/InputDialog.cc | 5 +++++ pekwm/Util.cc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pekwm/InputDialog.cc b/pekwm/InputDialog.cc index f25a75e..42a964a 100644 --- a/pekwm/InputDialog.cc +++ b/pekwm/InputDialog.cc @@ -23,6 +23,11 @@ extern "C" { #include + +#ifdef __minix +# define XK_MISCELLANY +# include +#endif } using std::list; diff --git a/pekwm/Util.cc b/pekwm/Util.cc index a15bb32..8dd9af4 100644 --- a/pekwm/Util.cc +++ b/pekwm/Util.cc @@ -442,7 +442,12 @@ do_iconv (iconv_t ic, const char **inp, size_t *in_bytes, #ifdef ICONV_CONST return iconv(ic, inp, in_bytes, outp, out_bytes); #else // !ICONV_CONST +# ifdef __minix + // this is as MESS across OS-es... + return iconv(ic, (const char**)inp, in_bytes, outp, out_bytes); +# else return iconv(ic, const_cast(inp), in_bytes, outp, out_bytes); +# endif #endif // ICONV_CONST }