mirror of
https://github.com/edeproject/ede.git
synced 2023-08-10 21:13:03 +03:00
iconv() is a mess between os-es; const char**, char**,... oh my...
This commit is contained in:
parent
240c195d87
commit
c39c0718f9
@ -23,6 +23,11 @@
|
||||
|
||||
extern "C" {
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
#ifdef __minix
|
||||
# define XK_MISCELLANY
|
||||
# include <X11/keysymdef.h>
|
||||
#endif
|
||||
}
|
||||
|
||||
using std::list;
|
||||
|
@ -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<char**>(inp), in_bytes, outp, out_bytes);
|
||||
# endif
|
||||
#endif // ICONV_CONST
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user