From: tomo <tomo>
Date: Mon, 6 Oct 2003 12:10:24 +0000 (+0000)
Subject: Use HAVE_CHISE instead of HAVE_CHISE_CLIENT to specify CHISE DB
X-Git-Tag: r21-4-12-chise-0_21-pre7-for-libchise-b1-r0_2_0-pre7~10
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=14f1b0e0a36debdc34dc3d6b07bbd7029e7bb477;p=chise%2Fxemacs-chise.git

Use HAVE_CHISE instead of HAVE_CHISE_CLIENT to specify CHISE DB
support.
---

diff --git a/src/casetab.c b/src/casetab.c
index f17efdf..6ce71ca 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -484,7 +484,8 @@ complex_vars_of_casetab (void)
 
 #ifdef UTF2000
   tem = MAKE_TRT_TABLE ();
-#ifdef HAVE_CHISE_CLIENT
+
+#ifdef HAVE_CHISE
   XCHAR_TABLE_NAME (tem) = Qdowncase;
 #endif
 #else
@@ -504,7 +505,7 @@ complex_vars_of_casetab (void)
 
 #ifdef UTF2000
   tem = MAKE_TRT_TABLE ();
-#ifdef HAVE_CHISE_CLIENT
+#ifdef HAVE_CHISE
   XCHAR_TABLE_NAME (tem) = Qflippedcase;
 #endif
 #else
diff --git a/src/char-ucs.h b/src/char-ucs.h
index 9d59f21..8e739b4 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -637,7 +637,7 @@ decoding_table_remove_char (Lisp_Object ccs, int code_point)
   decoding_table_put_char (ccs, code_point, Qunbound);
 }
 
-#ifdef HAVE_CHISE_CLIENT
+#ifdef HAVE_CHISE
 Emchar load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point);
 #endif
 
diff --git a/src/chartab.h b/src/chartab.h
index ac9ab50..021ceb5 100644
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -360,15 +360,17 @@ 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_CHISE
+Lisp_Object load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch);
+
 #ifdef HAVE_CHISE_CLIENT
 extern Lisp_Object Qsystem_char_id;
 
 Lisp_Object
 char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute,
 			       int writing_mode);
-
-Lisp_Object load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch);
-#endif
+#endif /* HAVE_CHISE_CLIENT */
+#endif /* HAVE_CHISE */
 
 INLINE_HEADER Lisp_Object
 get_char_id_table_0 (Lisp_Char_Table* cit, Emchar ch);
@@ -392,13 +394,13 @@ get_char_id_table (Lisp_Char_Table* cit, Emchar ch)
 {
   Lisp_Object val = get_char_id_table_0 (cit, ch);
 
-#ifdef HAVE_CHISE_CLIENT
+#ifdef HAVE_CHISE
   if (EQ (val, Qunloaded))
     {
       val = load_char_attribute_maybe (cit, ch);
       put_char_id_table_0 (cit, ch, val);
     }
-#endif
+#endif /* HAVE_CHISE */
   if (UNBOUNDP (val))
     return cit->default_value;
   else