Use `HAVE_CHISE_CLIENT' instead of `HAVE_DATABASE' to indicate the

CHISE client feature.

diff --git a/src/casetab.c b/src/casetab.c
index de0b31a..f17efdf 100644 (file)
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -484,7 +484,7 @@ complex_vars_of_casetab (void)
 
 #ifdef UTF2000
   tem = MAKE_TRT_TABLE ();
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   XCHAR_TABLE_NAME (tem) = Qdowncase;
 #endif
 #else
@@ -504,7 +504,7 @@ complex_vars_of_casetab (void)
 
 #ifdef UTF2000
   tem = MAKE_TRT_TABLE ();
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   XCHAR_TABLE_NAME (tem) = Qflippedcase;
 #endif
 #else

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 23be4cc..68017c2 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -686,7 +686,7 @@ decoding_table_remove_char (Lisp_Object ccs, int code_point)
   decoding_table_put_char (ccs, code_point, Qunbound);
 }
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 Emchar load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point);
 #endif
 

diff --git a/src/chartab.c b/src/chartab.c
index 73ada6f..381eb53 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -67,7 +67,7 @@ Lisp_Object Vword_combining_categories, Vword_separating_categories;
 
 EXFUN (Fmap_char_attribute, 3);
 
-#if defined(HAVE_DATABASE)
+#if defined(HAVE_CHISE_CLIENT)
 EXFUN (Fload_char_attribute_table, 1);
 
 Lisp_Object Vchar_db_stingy_mode;
@@ -315,7 +315,7 @@ map_over_uint8_byte_table (Lisp_Uint8_Byte_Table *ct, Lisp_Char_Table* root,
   return retval;
 }
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 static void
 save_uint8_byte_table (Lisp_Uint8_Byte_Table *ct, Lisp_Char_Table* root,
                       Lisp_Object db,
@@ -626,7 +626,7 @@ map_over_uint16_byte_table (Lisp_Uint16_Byte_Table *ct, Lisp_Char_Table* root,
   return retval;
 }
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 static void
 save_uint16_byte_table (Lisp_Uint16_Byte_Table *ct, Lisp_Char_Table* root,
                        Lisp_Object db,
@@ -886,7 +886,7 @@ map_over_byte_table (Lisp_Byte_Table *ct, Lisp_Char_Table* root,
   return retval;
 }
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 static void
 save_byte_table (Lisp_Byte_Table *ct, Lisp_Char_Table* root,
                 Lisp_Object db,
@@ -2064,7 +2064,7 @@ get_char_table (Emchar ch, Lisp_Char_Table *ct)
   {
     Lisp_Object ret = get_char_id_table (ct, ch);
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
     if (NILP (ret))
       {
        if (EQ (CHAR_TABLE_NAME (ct), Qdowncase))
@@ -2842,7 +2842,7 @@ map_char_table (Lisp_Char_Table *ct,
            struct chartab_range rainj;
            struct map_char_table_for_charset_arg mcarg;
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
            if (XCHAR_TABLE_UNLOADED(encoding_table))
              Fload_char_attribute_table (XCHAR_TABLE_NAME (encoding_table));
 #endif
@@ -3261,7 +3261,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
       {
        table = make_char_id_table (Qunbound);
        Fputhash (attribute, table, Vchar_attribute_hash_table);
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
        XCHAR_TABLE_NAME (table) = attribute;
 #endif
       }
@@ -3297,7 +3297,7 @@ Remove CHARACTER's ATTRIBUTE.
   return Qnil;
 }
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 Lisp_Object
 char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute,
                               int writing_mode)
@@ -3355,7 +3355,7 @@ Save values of ATTRIBUTE into database file.
 */
        (attribute))
 {
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   Lisp_Object table = Fgethash (attribute,
                                Vchar_attribute_hash_table, Qunbound);
   Lisp_Char_Table *ct;
@@ -3392,7 +3392,7 @@ Mount database file on char-attribute-table ATTRIBUTE.
 */
        (attribute))
 {
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   Lisp_Object table = Fgethash (attribute,
                                Vchar_attribute_hash_table, Qunbound);
 
@@ -3418,7 +3418,7 @@ Close database of ATTRIBUTE.
 */
        (attribute))
 {
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   Lisp_Object table = Fgethash (attribute,
                                Vchar_attribute_hash_table, Qunbound);
   Lisp_Char_Table *ct;
@@ -3443,7 +3443,7 @@ Reset values of ATTRIBUTE with database file.
 */
        (attribute))
 {
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   Lisp_Object table = Fgethash (attribute,
                                Vchar_attribute_hash_table, Qunbound);
   Lisp_Char_Table *ct;
@@ -3600,7 +3600,7 @@ the entire table.
   if (NILP (range))
     range = Qt;
   decode_char_table_range (range, &rainj);
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   if (CHAR_TABLE_UNLOADED(ct))
     Fload_char_attribute_table (attribute);
 #endif
@@ -4084,7 +4084,7 @@ syms_of_chartab (void)
   DEFSUBR (Ffind_char_attribute_table);
   defsymbol (&Qput_char_table_map_function, "put-char-table-map-function");
   DEFSUBR (Fput_char_table_map_function);
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   DEFSUBR (Fsave_char_attribute_table);
   DEFSUBR (Fmount_char_attribute_table);
   DEFSUBR (Freset_char_attribute_table);
@@ -4153,11 +4153,11 @@ void
 vars_of_chartab (void)
 {
 #ifdef UTF2000
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   DEFVAR_LISP ("char-db-stingy-mode", &Vchar_db_stingy_mode /*
 */ );
   Vchar_db_stingy_mode = Qt;
-#endif /* HAVE_DATABASE */
+#endif /* HAVE_CHISE_CLIENT */
 #endif
   /* DO NOT staticpro this.  It works just like Vweak_hash_tables. */
   Vall_syntax_tables = Qnil;

diff --git a/src/chartab.h b/src/chartab.h
index 9929b1f..8fa102b 100644 (file)
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 
 #ifdef UTF2000
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 #include "database.h"
 #endif
 
@@ -349,7 +349,7 @@ put_char_id_table_0 (Lisp_Char_Table* cit, Emchar code, Lisp_Object value)
   cit->table = put_byte_table (table1, (unsigned char)(code >> 24), table2);
 }
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 extern Lisp_Object Qsystem_char_id;
 
 Lisp_Object
@@ -381,7 +381,7 @@ get_char_id_table (Lisp_Char_Table* cit, Emchar ch)
 {
   Lisp_Object val = get_char_id_table_0 (cit, ch);
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   if (EQ (val, Qunloaded))
     {
       val = load_char_attribute_maybe (cit, ch);

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 38d42dc..f40ee0c 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -923,7 +923,7 @@ decode_defined_char (Lisp_Object ccs, int code_point)
     }
   if (CHARP (decoding_table))
     return XCHAR (decoding_table);
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
   if (EQ (decoding_table, Qunloaded))
     {
       char_id = load_char_decoding_entry_maybe (ccs, code_point);