1 files changed, 7 insertions, 1 deletions
diff --git a/chardefs.h b/chardefs.h
index 33ee512..a537be2 100644
--- a/chardefs.h
+++ b/chardefs.h
@@ -44,7 +44,10 @@
 #endif
 
 #ifdef CTRL
-#undef CTRL
+#  undef CTRL
+#endif
+#ifdef UNCTRL
+#  undef UNCTRL
 #endif
 
 /* Some character stuff. */
@@ -76,6 +79,9 @@
 
 #define NON_NEGATIVE(c)	((unsigned char)(c) == (c))
 
+/* Some systems define these; we want our definitions. */
+#undef ISPRINT
+
 #define ISALNUM(c)	(IN_CTYPE_DOMAIN (c) && isalnum (c))
 #define ISALPHA(c)	(IN_CTYPE_DOMAIN (c) && isalpha (c))
 #define ISDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isdigit (c))