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

Merge branch 'master' into utf8-conversion-2

Browse source
This commit is contained in:
Jon Trulson 2018-11-05 15:52:14 -07:00
commit cf89ba1a77
1 changed files with 7 additions and 4 deletions
Show stats 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 <errno.h>
#include <locale.h> /* getlocale(), LOCALE_STATUS, LC_xxx */ #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> #include <ctype.h>
#endif #endif
#include "CvStringI.h" /* for string functions used by Canvas Engine */ #include "CvStringI.h" /* for string functions used by Canvas Engine */
#include "StringFuncsI.h" /* for _CEStrcollProc */ #include "StringFuncsI.h" /* for _CEStrcollProc */
#if !defined(__linux__) /* JET: This was if !defined(linux), which is wrong. We should use the
# include <iconv.h> * real deal on linux too */
#else
#include <iconv.h>
#if 0
# define iconv_t int # define iconv_t int
# define iconv_open(a, b) ((iconv_t) -1) # define iconv_open(a, b) ((iconv_t) -1)
# define iconv(a, b, c, d, e) ((size_t) 0) # define iconv(a, b, c, d, e) ((size_t) 0)