--- np2/wince/w32/compiler.h	2003/11/21 06:51:16	1.3
+++ np2/wince/w32/compiler.h	2005/04/01 15:35:50	1.25
@@ -1,20 +1,70 @@
 #include	<windows.h>
+#include	<tchar.h>
 #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
 
 
-typedef	short			SINT16;
-typedef	unsigned short	UINT16;
-typedef	int				SINT32;
-typedef	unsigned int	UINT32;
+typedef	signed int			SINT;
+typedef	signed char			SINT8;
+typedef	unsigned char		UINT8;
+typedef	signed short		SINT16;
+typedef	unsigned short		UINT16;
+typedef	signed int			SINT32;
+typedef	unsigned int		UINT32;
 
 
+#if !defined(SIZE_VGA)
 #define	SIZE_QVGA
-#define	RGB16		UINT32
+#if !defined(SIZE_VGATEST)
+#define	RGB16			UINT32
+#endif
+#endif
+
+#if defined(ADDON_SOFTKBD)
+#define	SUPPORT_SOFTKBD		1
+#endif
+
+
+// for RISC test
+#define	REG8		UINT
+#define	REG16		UINT
+#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"
@@ -25,18 +75,37 @@ typedef	unsigned int	UINT32;
 #include	"trace.h"
 
 
-#define	GETTICK()	GetTickCount()
-#define	SPRINTF		wsprintf
+#define	GETTICK()			GetTickCount()
+#define	__ASSERT(s)
+#if !defined(UNICODE)
+#define	SPRINTF				wsprintf
+#define	STRLEN				lstrlen
+#else
+#define	SPRINTF				sprintf
+#define	STRLEN				strlen
+#endif
 
 #define	VERMOUTH_LIB
-#define SOUND_CRITICAL
+#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	SCREEN_BPP			16
 
-#define	SOUNDRESERVE	100
+#define	SUPPORT_HOSTDRV
+#define	SUPPORT_CRT15KHZ
+#define	SUPPORT_SWSEEKSND
 
-#define	SCREEN_BPP		16
+#define	CPUSTRUC_MEMWAIT