From: Paul Eggert Date: Tue, 25 Sep 2001 22:52:27 +0000 (+0000) Subject: Include iconv.h before testing for EILSEQ. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=1a9ace4d99495d5581d02fb08f6a49cfacf438b7;p=chaz%2Ftar Include iconv.h before testing for EILSEQ. --- diff --git a/lib/unicodeio.c b/lib/unicodeio.c index 35bb680..a1db6e2 100644 --- a/lib/unicodeio.c +++ b/lib/unicodeio.c @@ -38,22 +38,13 @@ 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 . 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 - , included above) and struct tm (defined in ) to - be declared. */ -#if HAVE_WCHAR_H && ! defined EILSEQ -# include -# include +#if HAVE_ICONV +# include #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 @@ -61,10 +52,6 @@ extern int errno; # define ENOTSUP EINVAL #endif -#if HAVE_ICONV -# include -#endif - #if HAVE_LANGINFO_CODESET && ! USE_INCLUDED_LIBINTL # include #endif