Use iconv on linux

diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h
index f73afb298410280d74d55d36f764c874c6b94fa5..7e63b2bfcea46ae9f8e935c9e3aaf4f239930ae1 100644 (file)
--- a/cde/include/EUSCompat.h
+++ b/cde/include/EUSCompat.h
@@ -106,13 +106,6 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 #if defined(__linux__) || defined(CSRG_BASED)
 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN             256
-
-#if !defined(CSRG_BASED)
-#define iconv_t                        int
-#define iconv_open(a, b)       ((iconv_t) -1)
-#define iconv(a, b, c, d, e)   ((size_t) 0)
-#define iconv_close(a)         (0)
-#endif
 #endif
 
 

diff --git a/cde/programs/dtcm/dtcm/RFCMIME.c b/cde/programs/dtcm/dtcm/RFCMIME.c
index b0291d8bb2ad4fed43767589c9b8c2c679622192..f6b9119cfb30aa1f5308cf26a4d5f2c245428c08 100644 (file)
--- a/cde/programs/dtcm/dtcm/RFCMIME.c
+++ b/cde/programs/dtcm/dtcm/RFCMIME.c
@@ -56,10 +56,7 @@ static char sccsid[] = "$TOG: RFCMIME.c /main/11 1999/06/30 12:08:55 mgreess $";
 #include <assert.h>
 #include <RFCMIME.h>
 
-/* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(__linux__)
-#  include <iconv.h>
-#endif
+#include <iconv.h>
 #include <EUSCompat.h>
 #include <locale.h>
 #include <LocaleXlate.h>

diff --git a/cde/programs/dtcm/dtcm/cm_i18n.c b/cde/programs/dtcm/dtcm/cm_i18n.c
index dbb7beda2185154d78df2f30ee9fb612b6586a26..f9a0d01ad59fbef8aa23aa775c06a22f38c98388 100644 (file)
--- a/cde/programs/dtcm/dtcm/cm_i18n.c
+++ b/cde/programs/dtcm/dtcm/cm_i18n.c
@@ -70,10 +70,7 @@ should be fixed in the future.
 #include <Xm/Xm.h>
 
 #include <langinfo.h>
-/* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(__linux__)
-#  include <iconv.h>
-#endif
+#include <iconv.h>
 #include <EUSCompat.h>
 
 #include "util.h"

diff --git a/cde/programs/dthelp/dthelpprint/PrintTopics.c b/cde/programs/dthelp/dthelpprint/PrintTopics.c
index 0e926668da639006e902eef7ec3673fc87be7c97..0d9959b988d2c18b1659b58c1393f80d79d53d50 100644 (file)
--- a/cde/programs/dthelp/dthelpprint/PrintTopics.c
+++ b/cde/programs/dthelp/dthelpprint/PrintTopics.c
@@ -53,12 +53,7 @@ $COPYRIGHT$:
 #include <langinfo.h>
 #endif
 
-/* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(__linux__)
-#  include <iconv.h>
-#else
-#  include <EUSCompat.h>
-#endif
+#include <iconv.h>
 #include <errno.h>
 
 #include <time.h>

diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C
index ac1d1c8d8945a808a6b21daca4f3bf659e61dff6..f36916c50905f793fc4babb11ac76095765605e4 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -86,12 +86,7 @@
 extern "C" {
 #endif
 
-#if !defined(__linux__)
-#  include <iconv.h>
-#else
-   // Iconv not defined for linux.  Use the EUSCompat stubs instead.
-#  include <EUSCompat.h>
-#endif
+#include <iconv.h>
 
 #if defined(SunOS) && (SunOS < 55)
 }

diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
index 3bd91306c1ea0299fbf7c7502f38cfba4c0f6292..ad180ee3d6a6f200a50acb56e9099c9f1d0bb61b 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
@@ -81,13 +81,7 @@
 extern "C" {
 #endif
 
-#if !defined(__linux__)
-   // Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#  include <iconv.h>
-#else
-#  include <EUSCompat.h>
-#endif
-
+#include <iconv.h>
 
 #if defined(SunOS) && (SunOS < 55)
 }