--- np2/wince/w32/compiler.h	2003/11/29 00:36:00	1.5
+++ np2/wince/w32/compiler.h	2004/06/19 17:30:48	1.17
@@ -1,30 +1,39 @@
 #include	<windows.h>
+#include	<tchar.h>
 #include	<stdio.h>
 #include	<stddef.h>
 
 #define	BYTESEX_LITTLE
+#if defined(UNICODE) && defined(CHARSET_OEM)
+#define	OSLANG_UTF8
+#else
 #define	OSLANG_SJIS
+#endif
 #define	OSLINEBREAK_CRLF
 
-
-typedef	short			SINT16;
+typedef signed char		SINT8;
+typedef unsigned char	UINT8;
+typedef	signed short	SINT16;
 typedef	unsigned short	UINT16;
-typedef	int				SINT32;
+typedef	signed int		SINT32;
 typedef	unsigned int	UINT32;
 
 
 #if !defined(SIZE_VGA)
 #define	SIZE_QVGA
+#if !defined(SIZE_VGATEST)
 #define	RGB16			UINT32
 #endif
+#define	SUPPORT_SOFTKBD		1
+#endif
+
 
 // for RISC test
 #define	REG8		UINT
 #define REG16		UINT
-#define REG32		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)
 
@@ -38,12 +47,21 @@ typedef	unsigned int	UINT32;
 
 
 #define	GETTICK()	GetTickCount()
+#if defined(UNICODE)
+#define	SPRINTF		sprintf
+#else
 #define	SPRINTF		wsprintf
+#endif
+#define	__ASSERT(s)
 
 #define	VERMOUTH_LIB
 #define SOUND_CRITICAL
 
+#if defined(UNICODE) && defined(CHARSET_OEM)
+#define	SUPPORT_UTF8
+#else
 #define	SUPPORT_SJIS
+#endif
 
 #define	SUPPORT_16BPP
 #define	MEMOPTIMIZE		2
@@ -52,3 +70,9 @@ typedef	unsigned int	UINT32;
 
 #define	SCREEN_BPP		16
 
+#define	SUPPORT_HOSTDRV
+#define	SUPPORT_CRT15KHZ
+#define	SUPPORT_SWSEEKSND
+
+#define	CPUSTRUC_MEMWAIT
+