--- np2/wince/w32/compiler.h	2005/02/09 20:11:37	1.22
+++ np2/wince/w32/compiler.h	2005/04/01 15:35:50	1.25
@@ -10,9 +10,10 @@
 #endif
 #define	OSLINEBREAK_CRLF
 
-typedef signed int			SINT;
-typedef signed char			SINT8;
-typedef unsigned char		UINT8;
+
+typedef	signed int			SINT;
+typedef	signed char			SINT8;
+typedef	unsigned char		UINT8;
 typedef	signed short		SINT16;
 typedef	unsigned short		UINT16;
 typedef	signed int			SINT32;
@@ -33,7 +34,7 @@ typedef	unsigned int		UINT32;
 
 // for RISC test
 #define	REG8		UINT
-#define REG16		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)
@@ -42,22 +43,32 @@ typedef	unsigned int		UINT32;
 
 
 #define	BRESULT				UINT
-#if !defined(OSLANG_UTF8)
-#define	OEMCHAR				TCHAR
-#define	OEMTEXT(string)		_T(string)
+#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)
+#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	"oemtext.h"
 #include	"milstr.h"
-#include	"ucscnv.h"
 #include	"_memory.h"
 #include	"rect.h"
 #include	"lstarray.h"
@@ -75,11 +86,14 @@ typedef	unsigned int		UINT32;
 #endif
 
 #define	VERMOUTH_LIB
-#define SOUND_CRITICAL
+#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