(XCHAR_OR_CHAR_INT):

Always use inline function.
Remove redundant type checking assert() - XINT will abort quite nicely.

diff --git a/src/character.h b/src/character.h
index 26bf1cc..94fa286 100644 (file)
--- a/src/character.h
+++ b/src/character.h
@@ -72,22 +72,13 @@ Functions/macros when MULE is defined:
 
 #define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x))
 
-#ifdef ERROR_CHECK_TYPECHECK
-
 INLINE_HEADER Emchar XCHAR_OR_CHAR_INT (Lisp_Object obj);
 INLINE_HEADER Emchar
 XCHAR_OR_CHAR_INT (Lisp_Object obj)
 {
-  assert (CHAR_OR_CHAR_INTP (obj));
   return CHARP (obj) ? XCHAR (obj) : XINT (obj);
 }
 
-#else
-
-#define XCHAR_OR_CHAR_INT(obj) (CHARP ((obj)) ? XCHAR ((obj)) : XINT ((obj)))
-
-#endif
-
 #define CHECK_CHAR_COERCE_INT(x) do {          \
   if (CHARP (x))                               \
      ;                                         \