--- np2/wince/wce/compiler.h	2005/03/19 21:02:05	1.18
+++ np2/wince/wce/compiler.h	2005/04/01 15:35:50	1.19
@@ -37,24 +37,35 @@ typedef	signed int		SINT32;
 // 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				UINT8
+#define	BRESULT				UINT
 #if defined(OSLANG_UCS2)
-#define	OEMCHAR				TCHAR
-#define	OEMTEXT(string)		_T(string)
+#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
 
 
@@ -66,10 +77,15 @@ typedef	signed int		SINT32;
 #include	"trace.h"
 
 
-#define	GETTICK()	GetTickCount()
+#define	GETTICK()			GetTickCount()
 #define	__ASSERT(s)
-#define	SPRINTF		sprintf
-#define	STRLEN		strlen
+#if !defined(UNICODE)
+#define	SPRINTF				wsprintf
+#define	STRLEN				lstrlen
+#else
+#define	SPRINTF				sprintf
+#define	STRLEN				strlen
+#endif
 
 #if defined(WIN32_PLATFORM_PSPC)
 #define	MENU_TASKMINIMIZE
@@ -79,17 +95,20 @@ typedef	signed int		SINT32;
 #define	VERMOUTH_LIB
 #define SOUND_CRITICAL
 
+#if defined(OSLANG_SJIS)
 #define	SUPPORT_SJIS
-#if defined(OSLANG_UTF8)
+#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