Include iconv.h before testing for EILSEQ.

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 35bb68075ccdf69c8896157f2138bea7977305e9..a1db6e282dd8828f5f79b8355dbb39abd7d1291f 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -38,22 +38,13 @@
 extern int errno;
 #endif
 
 extern int errno;
 #endif
 

-/* Define EILSEQ and ENOTSUP as portably as possible.  Some
-   nonstandard systems, like SunOS 4, don't have EILSEQ.  Others, like
-   BSD/OS 4.1, define it in <wchar.h>.  Callers that use EILSEQ and/or
-   ENOTSUP and that want to be portable to these nonstandard systems
-   should mimic the following includes and defines.  */
-
-/* BSD/OS 4.1 wchar.h defines EILSEQ, but it requires FILE (defined in
-   <stdio.h>, included above) and struct tm (defined in <time.h>) to
-   be declared.  */
-#if HAVE_WCHAR_H && ! defined EILSEQ
-# include <time.h>
-# include <wchar.h>
+#if HAVE_ICONV
+# include <iconv.h>

 #endif
 
 #endif
 

-/* Do not define EILSEQ to be EINVAL, since callers may want to
-   distinguish EINVAL and EILSEQ.  */
+/* Some systems, like SunOS 4, don't have EILSEQ.  On these systems,
+   define EILSEQ to some value other than EINVAL, because our invokers
+   may want to distinguish EINVAL from EILSEQ.  */

 #ifndef EILSEQ
 # define EILSEQ ENOENT
 #endif
 #ifndef EILSEQ
 # define EILSEQ ENOENT
 #endif


@@ -61,10 +52,6 @@ extern int errno;
 # define ENOTSUP EINVAL
 #endif
 
 # define ENOTSUP EINVAL
 #endif
 

-#if HAVE_ICONV
-# include <iconv.h>
-#endif
-

 #if HAVE_LANGINFO_CODESET && ! USE_INCLUDED_LIBINTL
 # include <langinfo.h>
 #endif
 #if HAVE_LANGINFO_CODESET && ! USE_INCLUDED_LIBINTL
 # include <langinfo.h>
 #endif