--- np2/win9x/compiler.h	2005/02/09 20:11:35	1.23
+++ np2/win9x/compiler.h	2007/01/08 08:52:21	1.36
@@ -11,23 +11,25 @@
 #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__
-typedef signed int			SINT;
-typedef signed char			SINT8;
-typedef unsigned char		UINT8;
+#if !defined(__GNUC__)
+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;
-typedef signed __int64		SINT64;
-typedef unsigned __int64	UINT64;
+typedef	signed __int64		SINT64;
+typedef	unsigned __int64	UINT64;
 #define	INLINE				__inline
 #define	QWORD_CONST(v)		((UINT64)(v))
 #define	SQWORD_CONST(v)		((SINT64)(v))
@@ -35,41 +37,51 @@ typedef unsigned __int64	UINT64;
 #define	vsnprintf			_vsnprintf
 #else
 #include	<stdlib.h>
-typedef signed char			SINT8;
-typedef unsigned char		UINT8;
-typedef	short				SINT16;
+typedef	signed int			SINT;
+typedef	signed char			SINT8;
+typedef	unsigned char		UINT8;
+typedef	signed short		SINT16;
 typedef	unsigned short		UINT16;
-typedef	int					SINT32;
-typedef signed __int64		SINT64;
+typedef	signed int			SINT32;
+typedef	signed __int64		SINT64;
 #define	INLINE				inline
 #endif
 #define	FASTCALL			__fastcall
 
+// for x86
 #define	LOADINTELDWORD(a)		(*((UINT32 *)(a)))
 #define	LOADINTELWORD(a)		(*((UINT16 *)(a)))
 #define	STOREINTELDWORD(a, b)	*(UINT32 *)(a) = (b)
 #define	STOREINTELWORD(a, b)	*(UINT16 *)(a) = (b)
 
-
 #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	"trace.h"
 #include	"rect.h"
 #include	"lstarray.h"
+#include	"trace.h"
 
 
 #define	GETTICK()			GetTickCount()
@@ -78,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
@@ -87,22 +99,29 @@ typedef signed __int64		SINT64;
 #endif
 
 #define	LABEL				__declspec(naked)
-#define RELEASE(x) 			if (x) {(x)->Release(); (x) = NULL;}
+#define	RELEASE(x) 			if (x) {(x)->Release(); (x) = NULL;}
 
+#if !defined(_WIN64)
 #define	OPNGENX86
+#endif
+
 #define	VERMOUTH_LIB
+#define	MT32SOUND_DLL
 #define	PARTSCALL	__fastcall
 #define	CPUCALL		__fastcall
 #define	MEMCALL		__fastcall
-#define DMACCALL	__fastcall
+#define	DMACCALL	__fastcall
 #define	IOOUTCALL	__fastcall
 #define	IOINPCALL	__fastcall
-#define SOUNDCALL	__fastcall
+#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
@@ -111,11 +130,11 @@ typedef signed __int64		SINT64;
 #define	SUPPORT_16BPP
 #define	SUPPORT_24BPP
 #define	SUPPORT_32BPP
-#define SUPPORT_NORMALDISP
+#define	SUPPORT_NORMALDISP
 
 #if defined(SUPPORT_PC9821)
 #define	CPUCORE_IA32
-#define IA32_PAGING_EACHSIZE
+#define	IA32_PAGING_EACHSIZE
 #define	SUPPORT_CRT31KHZ
 #define	SUPPORT_PC9801_119
 #endif
@@ -128,7 +147,14 @@ 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_ARC
+#define SUPPORT_ZLIB
+#if !defined(_WIN64)
+#define	SUPPORT_DCLOCK
+#endif
 
 #define	SUPPORT_RESUME
 #define	SUPPORT_STATSAVE	10
@@ -136,3 +162,6 @@ typedef signed __int64		SINT64;
 
 #define	SOUNDRESERVE	20
 
+
+#define	SUPPORT_TEXTCNV
+