--- np2/wince/wce/compiler.h	2003/12/09 15:49:14	1.8
+++ np2/wince/wce/compiler.h	2005/04/01 15:35:50	1.19
@@ -2,8 +2,11 @@
 #include	<stdio.h>
 #include	<stddef.h>
 
+
 #define	BYTESEX_LITTLE
+#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
 
 
@@ -11,6 +14,7 @@ typedef signed char		SINT8;
 typedef	signed short	SINT16;
 typedef	signed int		SINT32;
 
+
 #ifndef	ZeroMemory
 #define	ZeroMemory(a, b)		memset((a),  0 , (b))
 #endif
@@ -24,19 +28,47 @@ typedef	signed int		SINT32;
 
 #if !defined(SIZE_VGA)
 #define	SIZE_QVGA
+#if !defined(SIZE_VGATEST)
 #define	RGB16			UINT32
 #endif
+#endif
+
 
 // for ARM optimize
 #define	REG8		UINT
 #define REG16		UINT
-#define	LOW12(a)	((((UINT)(a)) << 20) >> 20)
-#define	LOW14(a)	((((UINT)(a)) << 18) >> 18)
-#define	LOW15(a)	((((UINT)(a)) << 17) >> 17)
+#define	LOW12(a)	((((UINT32)(a)) << 20) >> 20)
+#define	LOW14(a)	((((UINT32)(a)) << 18) >> 18)
+#define	LOW15(a)	((((UINT32)(a)) << 17) >> 17)
 #define	LOW16(a)	((UINT16)(a))
 #define	HIGH16(a)	(((UINT32)(a)) >> 16)
 
 
+#define	BRESULT				UINT
+#if defined(OSLANG_UCS2)
+#define	OEMCHAR				wchar_t
+#define	_OEMTEXT(x)			L ## x
+#define	OEMTEXT(string)		_OEMTEXT(string)
+#if defined(_UNICODE)
+#define	OEMSPRINTF			wsprintf
+#define	OEMSTRLEN			lstrlen
+#else
+#define	OEMSPRINTF			swprintf
+#define	OEMSTRLEN			wcslen
+#endif
+#else
+#define	OEMCHAR				char
+#define	OEMTEXT(string)		string
+#if defined(_UNICODE)
+#define	OEMSPRINTF			sprintf
+#define	OEMSTRLEN			strlen
+#else
+#define	OEMSPRINTF			wsprintf
+#define	OEMSTRLEN			lstrlen
+#endif
+#endif
+
+
 #include	"common.h"
 #include	"milstr.h"
 #include	"_memory.h"
@@ -45,28 +77,45 @@ typedef	signed int		SINT32;
 #include	"trace.h"
 
 
-#define	GETTICK()	GetTickCount()
-#define	SPRINTF		sprintf
+#define	GETTICK()			GetTickCount()
 #define	__ASSERT(s)
+#if !defined(UNICODE)
+#define	SPRINTF				wsprintf
+#define	STRLEN				lstrlen
+#else
+#define	SPRINTF				sprintf
+#define	STRLEN				strlen
+#endif
 
-#if defined(WIN32_PLATFORM_PSPC) && defined(SIZE_QVGA)
+#if defined(WIN32_PLATFORM_PSPC)
 #define	MENU_TASKMINIMIZE
-#define SUPPORT_SOFTKBD
+#define SUPPORT_SOFTKBD			1
 #endif
 
 #define	VERMOUTH_LIB
 #define SOUND_CRITICAL
 
+#if defined(OSLANG_SJIS)
 #define	SUPPORT_SJIS
+#elif defined(OSLANG_UTF8)
+#define	SUPPORT_UTF8
+#else
+#define	SUPPORT_ANK
+#endif
 
 #define	SUPPORT_16BPP
-#define	MEMOPTIMIZE		2
+#define	MEMOPTIMIZE			2
 
-#define	SOUNDRESERVE	100
+#define	SOUNDRESERVE		100
 
-#define	SCREEN_BPP		16
+#define	SCREEN_BPP			16
 
 #if defined(ARM)
 #define	OPNGENARM
 #endif
 
+#define	SUPPORT_CRT15KHZ
+#define	SUPPORT_SWSEEKSND
+
+#define	CPUSTRUC_MEMWAIT
+