From: tomo <tomo>
Date: Sat, 9 Aug 2003 17:40:52 +0000 (+0000)
Subject: (mark_char_table): Member `db' is deleted when `CHISE' is defined.
X-Git-Tag: r21-4-12-libchise-0_21-pre3~9
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b5ed2891ecc85518fcabf992b8b41be297e0b7d;p=chise%2Fxemacs-chise.git-

(mark_char_table): Member `db' is deleted when `CHISE' is defined.
(char_table_description): Likewise.
(Fmake_char_table): Likewise.
(Fcopy_char_table): Likewise.
(Fmount_char_attribute_table): Likewise.
(Fclose_char_attribute_table): Likewise.
(Freset_char_attribute_table): Likewise.
(load_char_attribute_maybe): Likewise.
(Fload_char_attribute_table): Likewise.
---

diff --git a/src/chartab.c b/src/chartab.c
index eae36a7..702fca6 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1275,7 +1275,9 @@ mark_char_table (Lisp_Object obj)
 
   mark_object (ct->table);
   mark_object (ct->name);
+#ifndef CHISE
   mark_object (ct->db);
+#endif
 #else
   int i;
 
@@ -1605,7 +1607,9 @@ static const struct lrecord_description char_table_description[] = {
   { XD_LISP_OBJECT, offsetof(Lisp_Char_Table, table) },
   { XD_LISP_OBJECT, offsetof(Lisp_Char_Table, default_value) },
   { XD_LISP_OBJECT, offsetof(Lisp_Char_Table, name) },
+#ifndef CHISE
   { XD_LISP_OBJECT, offsetof(Lisp_Char_Table, db) },
+#endif
 #else
   { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, ascii), NUM_ASCII_CHARS },
 #ifdef MULE
@@ -1807,8 +1811,10 @@ and 'syntax.  See `valid-char-table-type-p'.
     ct->mirror_table = Qnil;
 #else
   ct->name = Qnil;
+#ifndef CHISE
   ct->db = Qnil;
 #endif
+#endif
   ct->next_table = Qnil;
   XSETCHAR_TABLE (obj, ct);
   if (ty == CHAR_TABLE_TYPE_SYNTAX)
@@ -1882,7 +1888,9 @@ as CHAR-TABLE.  The values will not themselves be copied.
   ctnew->default_value = ct->default_value;
   /* [tomo:2002-01-21] Perhaps this code seems wrong */
   ctnew->name = ct->name;
+#ifndef CHISE
   ctnew->db = ct->db;
+#endif
 
   if (UINT8_BYTE_TABLE_P (ct->table))
     {
@@ -3435,7 +3443,9 @@ Mount database file on char-attribute-table ATTRIBUTE.
       ct = XCHAR_TABLE (table);
       ct->table = Qunloaded;
       XCHAR_TABLE_UNLOADED(table) = 1;
+#ifndef CHISE
       ct->db = Qnil;
+#endif
       return Qt;
     }
 #endif
@@ -3457,6 +3467,7 @@ Close database of ATTRIBUTE.
   else
     return Qnil;
 
+#ifndef CHISE
   if (!NILP (ct->db))
     {
       if (!NILP (Fdatabase_live_p (ct->db)))
@@ -3464,6 +3475,7 @@ Close database of ATTRIBUTE.
       ct->db = Qnil;
     }
 #endif
+#endif
   return Qnil;
 }
 
@@ -3489,9 +3501,11 @@ Reset values of ATTRIBUTE with database file.
 	}
       ct = XCHAR_TABLE (table);
       ct->table = Qunloaded;
+#ifndef CHISE
       if (!NILP (Fdatabase_live_p (ct->db)))
 	Fclose_database (ct->db);
       ct->db = Qnil;
+#endif
       XCHAR_TABLE_UNLOADED(table) = 1;
       return Qt;
     }
@@ -3517,11 +3531,13 @@ load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch)
       CHISE_Value value;
       Lisp_Object val;
 
+#ifndef CHISE
       if (!NILP (cit->db) && NILP (Fdatabase_live_p (cit->db)))
 	{
 	  Fclose_database (cit->db);
 	  cit->db = Qnil;
 	}
+#endif
 
       if (NILP (db_dir))
 	db_dir = build_string ("../lib-src");
@@ -3645,8 +3661,9 @@ Load values of ATTRIBUTE into database file.
   if (CHAR_TABLEP (table))
     {
 #ifdef CHISE
+#ifndef CHISE
       Lisp_Char_Table *cit = XCHAR_TABLE (table);
-
+#endif
       Lisp_Object db_dir = Vexec_directory;
       CHISE_DS ds;
       CHISE_Feature_Table *ft_feature;
@@ -3655,11 +3672,13 @@ Load values of ATTRIBUTE into database file.
       DBTYPE real_subtype;
       int status;
 
+#ifndef CHISE
       if (!NILP (cit->db) && NILP (Fdatabase_live_p (cit->db)))
 	{
 	  Fclose_database (cit->db);
 	  cit->db = Qnil;
 	}
+#endif
 
       if (NILP (db_dir))
 	db_dir = build_string ("../lib-src");