debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
parent 54b7550205 59dc231872
commit cf89ba1a77
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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
* real deal on linux too */
#include <iconv.h> #include <iconv.h>
#else
#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)