Mercurial > hg > octave-nkf > gnulib-hg
changeset 2692:0013b0a829f1
(mbrtowc): Assign to *pwc, and return 1 only if result is nonzero.
(iswprint): Use ISPRINT when substituting our own mbrtowc.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Tue, 04 Jul 2000 07:03:16 +0000 |
parents | b4b92c014c06 |
children | b33bfc609ceb |
files | lib/quotearg.c |
diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -64,15 +64,18 @@ # define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) # endif #else -# define mbrtowc(pwc, s, n, ps) 1 +# define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0) # define mbsinit(ps) 1 +# define iswprint(wc) ISPRINT ((unsigned char) (wc)) #endif -#if HAVE_WCTYPE_H -# include <wctype.h> -#endif -#if !defined iswprint && !HAVE_ISWPRINT -# define iswprint(wc) 1 +#ifndef iswprint +# if HAVE_WCTYPE_H +# include <wctype.h> +# endif +# if !defined iswprint && !HAVE_ISWPRINT +# define iswprint(wc) 1 +# endif #endif #define INT_BITS (sizeof (int) * CHAR_BIT)