external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

linux: DtHelp/StringFuncs, enable real iconv() support

Browse source 
For some reason, the #include of iconv.h was removed, and dummy stubs
were put in place on linux systems (only).  This caused iconv() calls
to be completely ignored.

Now we use iconv() just like very other OS we support.
This commit is contained in:
Jon Trulson 2018-11-05 15:33:16 -07:00
parent 2c1f56d37c
commit 59dc231872
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cde/lib/DtHelp/StringFuncs.c
View file

@ -51,16 +51,19 @@
#include <errno.h>
#include <locale.h> /* getlocale(), LOCALE_STATUS, LC_xxx */
#if defined(_AIX) || defined(CSRG_BASED)
#if defined(_AIX) || defined(CSRG_BASED) || defined(__linux__)
#include <ctype.h>
#endif
#include "CvStringI.h" /* for string functions used by Canvas Engine */
#include "StringFuncsI.h" /* for _CEStrcollProc */
#if !defined(__linux__)
# include <iconv.h>
#else
/* JET: This was if !defined(linux), which is wrong. We should use the
* real deal on linux too */
#include <iconv.h>
#if 0
# define iconv_t int
# define iconv_open(a, b) ((iconv_t) -1)
# define iconv(a, b, c, d, e) ((size_t) 0)