From 59dc231872a69fd32fe00cc614e32d47f4e544e6 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 5 Nov 2018 15:33:16 -0700 Subject: [PATCH] linux: DtHelp/StringFuncs, enable real iconv() support 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. --- cde/lib/DtHelp/StringFuncs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cde/lib/DtHelp/StringFuncs.c b/cde/lib/DtHelp/StringFuncs.c index 8d12e4325..a343e37d6 100644 --- a/cde/lib/DtHelp/StringFuncs.c +++ b/cde/lib/DtHelp/StringFuncs.c @@ -51,16 +51,19 @@ #include #include /* getlocale(), LOCALE_STATUS, LC_xxx */ -#if defined(_AIX) || defined(CSRG_BASED) +#if defined(_AIX) || defined(CSRG_BASED) || defined(__linux__) #include #endif #include "CvStringI.h" /* for string functions used by Canvas Engine */ #include "StringFuncsI.h" /* for _CEStrcollProc */ -#if !defined(__linux__) -# include -#else +/* JET: This was if !defined(linux), which is wrong. We should use the + * real deal on linux too */ + +#include + +#if 0 # define iconv_t int # define iconv_open(a, b) ((iconv_t) -1) # define iconv(a, b, c, d, e) ((size_t) 0)