diff options
| author | Jim Meyering <jim@meyering.net> | 2000-09-09 15:56:26 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2000-09-09 15:56:26 +0000 |
| commit | 5f9e998bca930333d4895e232383c5b8dbd758cf (patch) | |
| tree | 24ffa8f37b276d5d5703c10b5745faa99a45da54 | |
| parent | 16bcaae35bb643586bf3b36e96381c7cf8d9c57a (diff) | |
| download | coreutils-5f9e998bca930333d4895e232383c5b8dbd758cf.tar.xz | |
Rename ISASCII to IN_CTYPE_DOMAIN.
| -rw-r--r-- | lib/mbswidth.c | 8 | ||||
| -rw-r--r-- | lib/quotearg.c | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/lib/mbswidth.c b/lib/mbswidth.c index d187bc068..f196ac18d 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 68458940a..d5fbc9e60 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 { |