From: Jim Meyering Date: Sat, 9 Sep 2000 15:56:26 +0000 (+0000) Subject: Rename ISASCII to IN_CTYPE_DOMAIN. X-Git-Tag: FILEUTILS-4_0_27~61 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5f9e998bca930333d4895e232383c5b8dbd758cf;p=thirdparty%2Fcoreutils.git Rename ISASCII to IN_CTYPE_DOMAIN. --- diff --git a/lib/mbswidth.c b/lib/mbswidth.c index d187bc0685..f196ac18dc 100644 --- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -74,15 +74,13 @@ int wcwidth (); /* Get ISPRINT. */ #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -/* Undefine to protect against the definition in wctype.h of solaris2.6. */ -# undef ISASCII -# define ISASCII(c) 1 +# define IN_CTYPE_DOMAIN(c) 1 #else -# define ISASCII(c) isascii (c) +# define IN_CTYPE_DOMAIN(c) isascii(c) #endif /* Undefine to protect against the definition in wctype.h of solaris2.6. */ #undef ISPRINT -#define ISPRINT(c) (ISASCII (c) && isprint (c)) +#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) #include "mbswidth.h" diff --git a/lib/quotearg.c b/lib/quotearg.c index 68458940af..d5fbc9e603 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -92,15 +92,14 @@ size_t mbrtowc (); #define INT_BITS (sizeof (int) * CHAR_BIT) #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -/* Undefine to protect against the definition in wctype.h of solaris2.6. */ -# undef ISASCII -# define ISASCII(c) 1 +# define IN_CTYPE_DOMAIN(c) 1 #else -# define ISASCII(c) isascii (c) +# define IN_CTYPE_DOMAIN(c) isascii(c) #endif + /* Undefine to protect against the definition in wctype.h of solaris2.6. */ #undef ISPRINT -#define ISPRINT(c) (ISASCII (c) && isprint (c)) +#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) struct quoting_options {