From: tomo <tomo>
Date: Mon, 11 Oct 1999 20:19:46 +0000 (+0000)
Subject: (get_char_table): Don't use type `Charset_ID' for charset-id -
X-Git-Tag: r21-2-19-utf-2000-0_9-0~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f78c3b8bb3b3683bb00f7078292089fd10399a;p=chise%2Fxemacs-chise.git

(get_char_table): Don't use type `Charset_ID' for charset-id -
MIN_LEADING_BYTE.
(put_char_table): Likewise.
---

diff --git a/src/chartab.c b/src/chartab.c
index f5ee443..003c919 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -819,7 +819,7 @@ get_char_table (Emchar ch, struct Lisp_Char_Table *ct)
       val = ct->ascii[byte1 + 128];
     else
       {
-	Charset_ID lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
+	int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
 	val = ct->level1[lb];
 	if (CHAR_TABLE_ENTRYP (val))
 	  {
@@ -1074,8 +1074,7 @@ put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
 	}
       else
 	{
-	  Charset_ID lb
-	    = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
+	  int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
 	  ct->level1[lb] = val;
 	}
       break;
@@ -1083,8 +1082,7 @@ put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
     case CHARTAB_RANGE_ROW:
       {
 	struct Lisp_Char_Table_Entry *cte;
-	Charset_ID lb
-	  = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
+	int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
 	/* make sure that there is a separate entry for the row. */
 	if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
 	  ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
@@ -1108,7 +1106,7 @@ put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
 	else
 	  {
 	    struct Lisp_Char_Table_Entry *cte;
-	    Charset_ID lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
+	    int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
 	    /* make sure that there is a separate entry for the row. */
 	    if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
 	      ct->level1[lb] = make_char_table_entry (ct->level1[lb]);