Mercurial > hg > octave-kai > gnulib-hg

changeset 2234:c4a8e51bfd93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ISASCII): Add #undef and move definition to follow inclusion of wctype.h to work around solaris2.6 namespace pollution. (ISPRINT): Likewise.
author Jim Meyering <jim@meyering.net>
date Mon, 31 Jan 2000 08:27:51 +0000
parents baf7824839aa
children f3da4430f306
files lib/quotearg.c
diffstat 1 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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.  */