--- np2/win9x/compiler.h	2005/03/06 10:41:50	1.26
+++ np2/win9x/compiler.h	2007/01/08 08:52:21	1.36
@@ -11,14 +11,16 @@
 #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__
+#if !defined(__GNUC__)
 typedef	signed int			SINT;
 typedef	signed char			SINT8;
 typedef	unsigned char		UINT8;
@@ -35,6 +37,7 @@ typedef	unsigned __int64	UINT64;
 #define	vsnprintf			_vsnprintf
 #else
 #include	<stdlib.h>
+typedef	signed int			SINT;
 typedef	signed char			SINT8;
 typedef	unsigned char		UINT8;
 typedef	signed short		SINT16;
@@ -54,18 +57,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 +90,7 @@ typedef	signed __int64		SINT64;
 #else
 #define	__ASSERT(s)
 #endif
-#if defined(UNICODE)
+#if defined(_UNICODE)
 #define	SPRINTF				sprintf
 #define	STRLEN				strlen
 #else
@@ -90,7 +101,10 @@ typedef	signed __int64		SINT64;
 #define	LABEL				__declspec(naked)
 #define	RELEASE(x) 			if (x) {(x)->Release(); (x) = NULL;}
 
+#if !defined(_WIN64)
 #define	OPNGENX86
+#endif
+
 #define	VERMOUTH_LIB
 #define	MT32SOUND_DLL
 #define	PARTSCALL	__fastcall
@@ -102,9 +116,12 @@ typedef	signed __int64		SINT64;
 #define	SOUNDCALL	__fastcall
 #define	VRAMCALL	__fastcall
 #define	SCRNCALL	__fastcall
+#define	VERMOUTHCL	__fastcall
 
-#if !defined(UNICODE)
+#if defined(OSLANG_SJIS)
 #define	SUPPORT_SJIS
+#elif defined(OSLANG_UTF8)
+#define	SUPPORT_UTF8
 #else
 #define	SUPPORT_ANK
 #endif
@@ -131,7 +148,12 @@ typedef	signed __int64		SINT64;
 #define	SUPPORT_SASI
 #define	SUPPORT_SCSI
 #if defined(TRACE)
-	#define	SUPPORT_IDEIO
+#define	SUPPORT_IDEIO
+#endif
+#define SUPPORT_ARC
+#define SUPPORT_ZLIB
+#if !defined(_WIN64)
+#define	SUPPORT_DCLOCK
 #endif
 
 #define	SUPPORT_RESUME
@@ -140,3 +162,6 @@ typedef	signed __int64		SINT64;
 
 #define	SOUNDRESERVE	20
 
+
+#define	SUPPORT_TEXTCNV
+