changed the format of accepted values by --enable-unicode

2018-02-28 07:33:13 +00:00
parent 701554af0d
commit aaafc1371b
4 changed files with 52 additions and 15 deletions
--- a/lib/hcl-cfg.h.in
+++ b/lib/hcl-cfg.h.in
@ -327,6 +327,9 @@
 /* sizeof(__uint128_t) */
 #undef HCL_SIZEOF___UINT128_T

+/* Unicode character type size */
+#undef HCL_UNICODE_SIZE
+
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR

--- a/lib/hcl-cmn.h
+++ b/lib/hcl-cmn.h
@ -280,7 +280,7 @@ typedef unsigned char           hcl_bchu_t; /* unsigned version of hcl_bch_t for
 #define HCL_SIZEOF_BCH_T HCL_SIZEOF_CHAR
 #define HCL_SIZEOF_BCI_T HCL_SIZEOF_INT

-#if defined(HCL_ENABLE_UNICODE) && (HCL_ENABLE_UNICODE == 4)
+#if defined(HCL_UNICODE_SIZE) && (HCL_UNICODE_SIZE >= 4)
 #	if defined(__GNUC__) && defined(__CHAR32_TYPE__)
 	typedef __CHAR32_TYPE__    hcl_uch_t;
 #	else