(ISASCII): Add #undef and move definition to follow

inclusion of wctype.h to work around solaris2.6 namespace pollution.
(ISPRINT): Likewise.

diff --git a/lib/quotearg.c b/lib/quotearg.c
index 722fa734db0de6bd39cfdf7e83ca7b263f8d074f..47e4c142544d6798616656d0c1ae5e1e6c4c0fdb 100644 (file)
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -26,12 +26,6 @@
 #include <xalloc.h>
 
 #include <ctype.h>
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define ISASCII(c) 1
-#else
-# define ISASCII(c) isascii (c)
-#endif
-#define ISPRINT(c) (ISASCII (c) && isprint (c))
 
 #if ENABLE_NLS
 # include <libintl.h>
@@ -73,6 +67,17 @@
 
 #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
+#else
+# define ISASCII(c) isascii (c)
+#endif
+/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
+#undef ISASCII
+#define ISPRINT(c) (ISASCII (c) && isprint (c))
+
 struct quoting_options
 {
   /* Basic quoting style.  */