Rename ISASCII to IN_CTYPE_DOMAIN.

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index d187bc06858564b921f11f6fa7fa407ace68d825..f196ac18dc21e4c342fef6bd4ccb631a97fc719d 100644 (file)
--- 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 68458940af9847ea76a0b418e1c4a7ff1a5f0b8a..d5fbc9e60384ea4b7c0b823535c7d18ea79f8d53 100644 (file)
--- 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
 {