Browse Source

Use iconv on linux

Chase 5 years ago
parent
commit
4d7f9df692

+ 0 - 7
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
 
 

+ 1 - 4
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>

+ 1 - 4
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"

+ 1 - 6
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>

+ 1 - 6
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)
 }

+ 1 - 7
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)
 }