diff options
| author | Jim Meyering <jim@meyering.net> | 2000-06-23 21:05:50 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2000-06-23 21:05:50 +0000 |
| commit | fef29da8fbbea056eb7f218da57f975607a065e8 (patch) | |
| tree | bf0cae3a2bd0d4165b036f52a13dd2a464243d54 /lib | |
| parent | 284905fbb981fd6c6adff6ea1a91c404c52374c0 (diff) | |
| download | coreutils-fef29da8fbbea056eb7f218da57f975607a065e8.tar.xz | |
Include <wctype.h> after <wchar.h>,
for Solaris 2.5.
(mbrtowc, mbstate_t): Define substitutes if
HAVE_MBRTOWC && HAVE_WCHAR_H && !HAVE_MBSTATE_T_OBJECT.
(iswprint): Define to 1 if !defined iswprint && !HAVE_ISWPRINT,
not if ! (HAVE_MBRTOWC && HAVE_WCHAR_H).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/quotearg.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/quotearg.c b/lib/quotearg.c index 6e7ac8afe..7fa5278bb 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -58,19 +58,25 @@ # include <string.h> #endif -#if HAVE_WCTYPE_H -# include <wctype.h> -#endif - #if HAVE_MBRTOWC && HAVE_WCHAR_H # include <wchar.h> +# if !HAVE_MBSTATE_T_OBJECT +# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) +# define mbstate_t int +# endif #else -# define iswprint(wc) 1 # define mbrtowc(pwc, s, n, ps) 1 # define mbsinit(ps) 1 # define mbstate_t int #endif +#if HAVE_WCTYPE_H +# include <wctype.h> +#endif +#if !defined iswprint && !HAVE_ISWPRINT +# define iswprint(wc) 1 +#endif + #define INT_BITS (sizeof (int) * CHAR_BIT) #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) |