--- np2/wince/w32/compiler.h	2004/06/19 17:30:48	1.17
+++ np2/wince/w32/compiler.h	2004/07/15 13:48:40	1.21
@@ -3,14 +3,14 @@
 #include	<stdio.h>
 #include	<stddef.h>
 
+
 #define	BYTESEX_LITTLE
-#if defined(UNICODE) && defined(CHARSET_OEM)
-#define	OSLANG_UTF8
-#else
+#if !defined(OSLANG_ANK) && !defined(OSLANG_SJIS) && !defined(OSLANG_EUC) && !defined(OSLANG_UTF8) && !defined(OSLANG_UCS2) && !defined(OSLANG_UCS4)
 #define	OSLANG_SJIS
 #endif
 #define	OSLINEBREAK_CRLF
 
+
 typedef signed char		SINT8;
 typedef unsigned char	UINT8;
 typedef	signed short	SINT16;
@@ -24,6 +24,9 @@ typedef	unsigned int	UINT32;
 #if !defined(SIZE_VGATEST)
 #define	RGB16			UINT32
 #endif
+#endif
+
+#if defined(ADDON_SOFTKBD)
 #define	SUPPORT_SOFTKBD		1
 #endif
 
@@ -39,7 +42,9 @@ typedef	unsigned int	UINT32;
 
 
 #include	"common.h"
+#include	"oemtext.h"
 #include	"milstr.h"
+#include	"ucscnv.h"
 #include	"_memory.h"
 #include	"rect.h"
 #include	"lstarray.h"
@@ -49,18 +54,19 @@ typedef	unsigned int	UINT32;
 #define	GETTICK()	GetTickCount()
 #if defined(UNICODE)
 #define	SPRINTF		sprintf
+#define	STRLEN		strlen
 #else
 #define	SPRINTF		wsprintf
+#define	STRLEN		lstrlen
 #endif
 #define	__ASSERT(s)
 
 #define	VERMOUTH_LIB
 #define SOUND_CRITICAL
 
-#if defined(UNICODE) && defined(CHARSET_OEM)
-#define	SUPPORT_UTF8
-#else
 #define	SUPPORT_SJIS
+#if defined(OSLANG_UTF8)
+#define	SUPPORT_UTF8
 #endif
 
 #define	SUPPORT_16BPP