--- np2/win9x/compiler.h	2005/02/12 12:13:59	1.24
+++ np2/win9x/compiler.h	2005/04/01 15:35:49	1.29
@@ -11,11 +11,13 @@
 #endif
 
 #define	BYTESEX_LITTLE
-#if !defined(UNICODE)
+#if !defined(OSLANG_UTF8)
+#if !defined(_UNICODE)
 #define	OSLANG_SJIS
 #else
 #define	OSLANG_UCS2
 #endif
+#endif
 #define	OSLINEBREAK_CRLF
 
 #ifndef __GNUC__
@@ -54,18 +56,26 @@ typedef	signed __int64		SINT64;
 #define	sigjmp_buf				jmp_buf
 #define	sigsetjmp(env, mask)	setjmp(env)
 #define	siglongjmp(env, val)	longjmp(env, val)
-#define	msgbox(title, msg)		MessageBox(NULL, msg, title, MB_OK)
+#define	msgbox(title, msg)		__msgbox(title, msg)
 
 #define	STRCALL		__stdcall
 
 #define	BRESULT				UINT8
+#if !defined(OSLANG_UTF8)
 #define	OEMCHAR				TCHAR
 #define	OEMTEXT(string)		_T(string)
 #define	OEMSPRINTF			wsprintf
 #define	OEMSTRLEN			lstrlen
+#else
+#define	OEMCHAR				char
+#define	OEMTEXT(string)		string
+#define	OEMSPRINTF			sprintf
+#define	OEMSTRLEN			strlen
+#endif
 
 
 #include	"common.h"
+#include	"win32sub.h"
 #include	"milstr.h"
 #include	"_memory.h"
 #include	"rect.h"
@@ -79,7 +89,7 @@ typedef	signed __int64		SINT64;
 #else
 #define	__ASSERT(s)
 #endif
-#if defined(UNICODE)
+#if defined(_UNICODE)
 #define	SPRINTF				sprintf
 #define	STRLEN				strlen
 #else
@@ -92,6 +102,7 @@ typedef	signed __int64		SINT64;
 
 #define	OPNGENX86
 #define	VERMOUTH_LIB
+#define	MT32SOUND_DLL
 #define	PARTSCALL	__fastcall
 #define	CPUCALL		__fastcall
 #define	MEMCALL		__fastcall
@@ -102,8 +113,10 @@ typedef	signed __int64		SINT64;
 #define	VRAMCALL	__fastcall
 #define	SCRNCALL	__fastcall
 
-#if !defined(UNICODE)
+#if defined(OSLANG_SJIS)
 #define	SUPPORT_SJIS
+#elif defined(OSLANG_UTF8)
+#define	SUPPORT_UTF8
 #else
 #define	SUPPORT_ANK
 #endif
@@ -129,7 +142,9 @@ typedef	signed __int64		SINT64;
 #define	SUPPORT_HOSTDRV
 #define	SUPPORT_SASI
 #define	SUPPORT_SCSI
-// #define	SUPPORT_IDEIO
+#if defined(TRACE)
+	#define	SUPPORT_IDEIO
+#endif
 
 #define	SUPPORT_RESUME
 #define	SUPPORT_STATSAVE	10
@@ -137,3 +152,6 @@ typedef	signed __int64		SINT64;
 
 #define	SOUNDRESERVE	20
 
+
+#define	SUPPORT_TEXTCNV
+