--- np2/win9xc/compiler.h	2003/11/21 06:51:15	1.5
+++ np2/win9xc/compiler.h	2004/03/31 19:23:38	1.24
@@ -1,16 +1,52 @@
 #include	<windows.h>
 #include	<stdio.h>
 #include	<stddef.h>
+#include	<setjmp.h>
 
 #define	BYTESEX_LITTLE
 #define	OSLANG_SJIS
 #define	OSLINEBREAK_CRLF
 
 
-typedef	short			SINT16;
-typedef	unsigned short	UINT16;
-typedef	int				SINT32;
-typedef	unsigned int	UINT32;
+#ifndef __GNUC__
+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;
+#define	INLINE				__inline
+#define	QWORD_CONST(v)		((DWORDLONG)(v))
+#define	SQWORD_CONST(v)		((LONGLONG)(v))
+#define	snprintf			_snprintf
+#define	vsnprintf			_vsnprintf
+#else
+#include	<stdlib.h>
+typedef signed char			SINT8;
+typedef unsigned char		UINT8;
+typedef	short				SINT16;
+typedef	unsigned short		UINT16;
+typedef	int					SINT32;
+typedef signed __int64		SINT64;
+#define	INLINE				inline
+#endif
+
+// for RISC test
+#define	REG8		UINT
+#define REG16		UINT
+
+
+// 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	FASTCALL	__fastcall
+
 
 #include	"common.h"
 #include	"milstr.h"
@@ -21,6 +57,7 @@ typedef	unsigned int	UINT32;
 
 #define	GETTICK()	GetTickCount()
 #define	SPRINTF		wsprintf
+#define	__ASSERT(s)
 
 #define	LABEL		__declspec(naked)
 #define RELEASE(x) 	if (x) {(x)->Release(); (x) = NULL;}
@@ -39,7 +76,7 @@ typedef	unsigned int	UINT32;
 #define	SUPPORT_SJIS
 
 // #define	SUPPORT_8BPP
-// #define	SUPPORT_16BPP
+#define	SUPPORT_16BPP
 // #define	SUPPORT_24BPP
 #define	SUPPORT_32BPP
 #define SUPPORT_NORMALDISP
@@ -47,3 +84,22 @@ typedef	unsigned int	UINT32;
 
 #define	SOUNDRESERVE	20
 
+#if defined(CPUCORE_IA32)
+#define	SUPPORT_CRT31KHZ
+#define	SUPPORT_PC9821
+#define	SUPPORT_PC9801_119
+#define	SUPPORT_SOFTKBD			0
+#define IA32_PAGING_EACHSIZE
+#endif
+#define	SUPPORT_HOSTDRV
+#define	SUPPORT_SWSEEKSND
+
+#if defined(CPUCORE_IA32)
+#define	sigjmp_buf				jmp_buf
+#define	sigsetjmp(env, mask)	setjmp(env)
+#define	siglongjmp(env, val)	longjmp(env, val)
+#define	msgbox(title, msg)		TRACEOUT(("%s", title)); \
+								TRACEOUT(("%s", msg)); \
+								MessageBox(NULL, msg, title, MB_OK)
+#endif
+