mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

iconv() is a mess between os-es; const char**, char**,... oh my...

Browse Source
This commit is contained in:
Sanel Zukan 2012-09-24 14:01:08 +00:00
parent 240c195d87
commit c39c0718f9
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pekwm/InputDialog.cc
View File

@ -23,6 +23,11 @@
extern "C" { extern "C" {
#include <X11/Xutil.h> #include <X11/Xutil.h>
#ifdef __minix
# define XK_MISCELLANY
# include <X11/keysymdef.h>
#endif
} }
using std::list; using std::list;

5
pekwm/Util.cc
View File

@ -442,7 +442,12 @@ do_iconv (iconv_t ic, const char **inp, size_t *in_bytes,
#ifdef ICONV_CONST #ifdef ICONV_CONST
return iconv(ic, inp, in_bytes, outp, out_bytes); return iconv(ic, inp, in_bytes, outp, out_bytes);
#else // !ICONV_CONST #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<char**>(inp), in_bytes, outp, out_bytes); return iconv(ic, const_cast<char**>(inp), in_bytes, outp, out_bytes);
# endif
#endif // ICONV_CONST #endif // ICONV_CONST
} }