* Rename cr_conv to nl_conv, o_crconv to o_nlconv, crmode_f to nlmode_f,

[nkf/nkf.git] / config.h

diff --git a/config.h b/config.h
index e46fe95..9da82c6 100644 (file)
--- a/config.h
+++ b/config.h
@@ -43,6 +43,15 @@
  */
 /* #define INT_IS_SHORT */
 
+
+#if defined(INT_IS_SHORT)
+typedef long nkf_char;
+typedef unsigned char nkf_nfchar;
+#else
+typedef int nkf_char;
+typedef int nkf_nfchar;
+#endif
+
 /* Unicode Normalization */
 #define UNICODE_NORMALIZATION
 
@@ -59,16 +68,21 @@
 #define DEFAULT_CODE_SJIS
 #endif
 
-#if defined(UTF8_INPUT_ENABLE) && defined(UNICODE_NORMALIZATION)
+#if defined(NUMCHAR_OPTION) && !defined(UTF8_INPUT_ENABLE)
+#define UTF8_INPUT_ENABLE
+#endif
+
+#ifdef UNICODE_NORMALIZATION
+#ifndef UTF8_INPUT_ENABLE
+#define UTF8_INPUT_ENABLE
+#endif
 #define NORMALIZATION_TABLE_LENGTH 942
 #define NORMALIZATION_TABLE_NFC_LENGTH 3
 #define NORMALIZATION_TABLE_NFD_LENGTH 9
 struct normalization_pair{
-    int nfc[NORMALIZATION_TABLE_NFC_LENGTH];
-    int nfd[NORMALIZATION_TABLE_NFD_LENGTH];
+    const nkf_nfchar nfc[NORMALIZATION_TABLE_NFC_LENGTH];
+    const nkf_nfchar nfd[NORMALIZATION_TABLE_NFD_LENGTH];
 };
-#else
-#undef UNICODE_NORMALIZATION
 #endif
 
 #endif /* _CONFIG_H_ */