From: tomo <tomo>
Date: Tue, 28 Nov 2000 03:43:34 +0000 (+0000)
Subject: (XCHAR_OR_CHAR_INT):
X-Git-Tag: r21-2-37-utf-2000-0_17-1~21
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f9d83955380ffdca070609971e4fc4a9517dde49;p=chise%2Fxemacs-chise.git

(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
--- 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))				\
      ;						\