From: tomo Date: Mon, 15 Jul 2002 02:23:10 +0000 (+0000) Subject: (get_char_id_table_0): New inline function. X-Git-Tag: r21-2-44-utf-2000-0_19-er2-n14~15 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c966a083eb09b7deb0bee256ff3a66282a16cb18;p=chise%2Fxemacs-chise.git.1 (get_char_id_table_0): New inline function. (get_char_id_table): Use `get_char_id_table_0'. --- diff --git a/src/chartab.h b/src/chartab.h index 11d2a96..f8c7d18 100644 --- a/src/chartab.h +++ b/src/chartab.h @@ -355,18 +355,28 @@ char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute, Lisp_Object load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch); #endif -INLINE_HEADER Lisp_Object get_char_id_table (Lisp_Char_Table* cit, Emchar ch); +INLINE_HEADER Lisp_Object +get_char_id_table_0 (Lisp_Char_Table* cit, Emchar ch); +INLINE_HEADER Lisp_Object +get_char_id_table_0 (Lisp_Char_Table* cit, Emchar ch) +{ + return get_byte_table (get_byte_table + (get_byte_table + (get_byte_table + (cit->table, + (unsigned char)(ch >> 24)), + (unsigned char) (ch >> 16)), + (unsigned char) (ch >> 8)), + (unsigned char) ch); +} + +INLINE_HEADER Lisp_Object +get_char_id_table (Lisp_Char_Table* cit, Emchar ch); INLINE_HEADER Lisp_Object get_char_id_table (Lisp_Char_Table* cit, Emchar ch) { - Lisp_Object val = get_byte_table (get_byte_table - (get_byte_table - (get_byte_table - (cit->table, - (unsigned char)(ch >> 24)), - (unsigned char) (ch >> 16)), - (unsigned char) (ch >> 8)), - (unsigned char) ch); + Lisp_Object val = get_char_id_table_0 (cit, ch); + #ifdef HAVE_DATABASE if (EQ (val, Qunloaded)) {