Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6921:16e059328532
Assume ANSI C.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 04 Jul 2006 16:46:23 +0000 |
parents | b392232a8925 |
children | 640106e1be97 |
files | lib/ChangeLog lib/mbswidth.c |
diffstat | 2 files changed, 8 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2006-06-27 Bruno Haible <bruno@clisp.org> + + Assume ANSI C header files and <ctype.h> functions. + * mbswidth.c (IN_CTYPE_DOMAIN, ISPRINT, ISCNTRL): Remove macros. + (mbsnwidth): Use isprint, iscntrl instead. + 2006-07-03 Jim Meyering <jim@meyering.net> * cycle-check.h (CYCLE_CHECK_REFLECT_CHDIR_UP): Abort if this
--- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -60,18 +60,6 @@ # endif #endif -/* Get ISPRINT. */ -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) -#endif -/* Undefine to protect against the definition in wctype.h of Solaris 2.6. */ -#undef ISPRINT -#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) -#undef ISCNTRL -#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c)) - /* Returns the number of columns needed to represent the multibyte character string pointed to by STRING. If a non-printable character occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned. @@ -195,10 +183,10 @@ { unsigned char c = (unsigned char) *p++; - if (ISPRINT (c)) + if (isprint (c)) width++; else if (!(flags & MBSW_REJECT_UNPRINTABLE)) - width += (ISCNTRL (c) ? 0 : 1); + width += (iscntrl (c) ? 0 : 1); else return -1; }