From 74b673479ecf905b536b725d6c609f95539425b3 Mon Sep 17 00:00:00 2001 From: Yuguo Zhang Date: Tue, 8 Aug 2017 14:10:58 +0800 Subject: [PATCH] using 16bit unicode on windows platform. because windows using utf16 internally, by using 16bit unicode chararcter, there is no need to convert ecl_character to wchar_t in embedding environment. --- msvc/c/Makefile | 7 +++---- msvc/ecl/config.h.msvc6 | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/msvc/c/Makefile b/msvc/c/Makefile index e0b33570f..e4b3204c3 100755 --- a/msvc/c/Makefile +++ b/msvc/c/Makefile @@ -20,10 +20,9 @@ THREADS_OBJ= !endif !if "$(ECL_UNICODE)" != "" -ECL_UNICODE_FLAG=21 -ECL_UCD_OBJ = ucd.obj ucd-0000.obj ucd-0016.obj \ - ucd-0032.obj ucd-0048.obj ucd-0064.obj \ - ucd-0080.obj ucd-0096.obj +ECL_UNICODE_FLAG=16 +ECL_UCD_OBJ = ucd16.obj ucd16-0000.obj ucd16-0016.obj \ + ucd16-0032.obj ucd16-0048.obj ucd16-0064.obj !else ECL_UNICODE_FLAG=0 !endif diff --git a/msvc/ecl/config.h.msvc6 b/msvc/ecl/config.h.msvc6 index af1c67a8d..2ec93f60e 100755 --- a/msvc/ecl/config.h.msvc6 +++ b/msvc/ecl/config.h.msvc6 @@ -155,11 +155,11 @@ typedef unsigned int cl_hashkey; * The character type */ #ifdef ECL_UNICODE -#define ECL_CHAR_CODE_LIMIT 1114112 /* unicode character code limit */ +#define ECL_CHAR_CODE_LIMIT 65536 /* unicode character code limit */ #else #define ECL_CHAR_CODE_LIMIT 256 /* unicode character code limit */ #endif -typedef int ecl_character; +typedef short ecl_character; typedef unsigned char ecl_base_char; /*