Index: generic/nsfInt.h
===================================================================
diff -u -N -rfc37052db0300fa580ab01429454387346030040 -rf0bca18a085d7e071f54af9b4f0136b65ad1f8e6
--- generic/nsfInt.h	(.../nsfInt.h)	(revision fc37052db0300fa580ab01429454387346030040)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision f0bca18a085d7e071f54af9b4f0136b65ad1f8e6)
@@ -184,7 +184,7 @@
 #define nonnull_assert(assertion) assert((assertion))
 
 /*
- * Trie to use gcc __attribute__ unused and mangle the name, so the
+ * Try to use gcc __attribute__ "unused" and mangle the name, so the
  * attribute could not be used, if declared as unused.
  */
 #ifdef UNUSED
@@ -196,6 +196,10 @@
 # define UNUSED(x) (x)
 #endif
 
+#ifndef CHARTTYPE
+# define CHARTYPE(what,c)           (is ## what ((int)((unsigned char)(c))))
+#endif
+
 #if defined(NSF_DTRACE)
 # include "nsfDTrace.h"
 # define NSF_DTRACE_METHOD_ENTRY_ENABLED()		unlikely(NSF_METHOD_ENTRY_ENABLED())