--- np2/macosx/compiler.h	2003/11/21 06:51:11	1.6
+++ np2/macosx/compiler.h	2005/05/20 17:25:03	1.22
@@ -2,9 +2,6 @@
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<stddef.h>
-#ifndef NP2GCC
-#include	<MultiProcessing.h>
-#endif
 
 #define	MACOS
 #define	BYTESEX_BIG
@@ -12,21 +9,26 @@
 #define	OSLINEBREAK_CR
 
 
-typedef char			TCHAR;
-typedef unsigned char	BYTE;
-
-typedef int				SINT;
+typedef signed int		SINT;
 typedef unsigned int	UINT;
 
-typedef short			SINT16;
+typedef signed char		SINT8;
+typedef unsigned char	UINT8;
+
+typedef signed short	SINT16;
 typedef unsigned short	UINT16;
 
-typedef int				SINT32;
+typedef signed int		SINT32;
 typedef unsigned int	UINT32;
 
 typedef Boolean			BOOL;
+typedef signed char		TCHAR;
+typedef signed char		CHAR;
+typedef unsigned char	BYTE;
 
 
+#define	INLINE		inline
+
 #define	MAX_PATH	260
 
 #define	ZeroMemory(a, b)		memset((a),  0 , (b))
@@ -36,6 +38,11 @@ typedef Boolean			BOOL;
 #define	max(a, b)				(((a)>(b))?(a):(b))
 #define	min(a, b)				(((a)<(b))?(a):(b))
 
+#define	BRESULT				UINT8
+#define	OEMCHAR				char
+#define	OEMTEXT(string)		string
+#define	OEMSPRINTF			sprintf
+#define	OEMSTRLEN			strlen
 
 #include	"common.h"
 #include	"macossub.h"
@@ -47,11 +54,19 @@ typedef Boolean			BOOL;
 
 #define	GETTICK()			macos_gettick()
 #define	SPRINTF				sprintf
+#define	STRLEN				strlen
+#define	__ASSERT(s)
 
 #define	VERMOUTH_LIB
 // #define SOUND_CRITICAL
 
+#if defined(OSLANG_SJIS)
 #define	SUPPORT_SJIS
+#elif defined(OSLANG_UTF8)
+#define	SUPPORT_UTF8
+#else
+#define	SUPPORT_ANK
+#endif
 
 // #define	SUPPORT_8BPP
 #ifdef NP2GCC
@@ -62,5 +77,35 @@ typedef Boolean			BOOL;
 // #define SUPPORT_NORMALDISP
 #define	MEMOPTIMIZE		1
 
+#if defined(CPUCORE_IA32)
+#define	SUPPORT_CRT31KHZ
+#define	SUPPORT_PC9821
+#define	IA32_PAGING_EACHSIZE
+#endif
+#define	SUPPORT_CRT15KHZ
+#define	SUPPORT_S98
+#define	SUPPORT_SWSEEKSND
+#define	SUPPORT_HOSTDRV
+#define	SUPPORT_SASI
+#define	SUPPORT_SCSI
+#define SUPPORT_KEYDISP
+#define SUPPORT_SOFTKBD	0
+
+#define	USE_RESUME
 #define	SOUNDRESERVE	80
 
+#if defined(CPUCORE_IA32)
+typedef SInt64			SINT64;
+typedef UInt64			UINT64;
+#define FASTCALL
+#define CPUCALL
+#define MEMCALL
+#define	SUPPORT_PC9821
+#define	SUPPORT_CRT31KHZ
+#define IA32_PAGING_EACHSIZE
+#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))
+#endif