--- np2/x11/compiler.h	2003/11/17 16:12:27	1.3
+++ np2/x11/compiler.h	2004/05/15 06:45:56	1.17
@@ -1,6 +1,12 @@
 #ifndef	NP2_X11_COMPILER_H__
 #define	NP2_X11_COMPILER_H__
 
+#ifdef	WORDS_BIGENDIAN
+#define	BYTESEX_BIG
+#else	/* !WORDS_BIGENDIAN */
+#define	BYTESEX_LITTLE
+#endif	/* WORDS_BIGENDIAN */
+
 #if defined(USE_NETBSDAUDIO) && !defined(__NetBSD__)
 #undef	USE_NETBSDAUDIO
 #endif
@@ -13,12 +19,6 @@
 #undef	NOSOUND
 #endif	/* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */
 
-#ifdef	WORDS_BIGENDIAN
-#define	BYTESEX_BIG
-#else	/* !WORDS_BIGENDIAN */
-#define	BYTESEX_LITTLE
-#endif	/* WORDS_BIGENDIAN */
-
 #if defined(NOSOUND)
 
 #undef	VERMOUTH_LIB
@@ -31,14 +31,16 @@
 
 #define	VERMOUTH_LIB
 #undef	SOUND_CRITICAL
-#define	SOUNDRESERVE	100
+#undef	SOUNDRESERVE
 
 #endif  /* NOSOUND */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -47,36 +49,36 @@
 #include <unistd.h>
 
 #define	X11
+#define	OSLANG_EUC
+#define	OSLINEBREAK_LF
 
-typedef	signed char	CHAR;
-typedef	signed short	SHORT;
-typedef	signed int	INT;
-typedef	signed long	LONG;
-
-typedef	unsigned char	UCHAR;
-typedef	unsigned short	USHORT;
-typedef	unsigned int	UINT;
-typedef	unsigned long	ULONG;
-
-typedef	signed char	SINT8;
-typedef	signed short	SINT16;
-typedef	signed int	SINT32;
-
-typedef	unsigned char	UINT8;
-typedef	unsigned short	UINT16;
-typedef	unsigned int	UINT32;
-
-typedef	unsigned char	BYTE;
-typedef	unsigned char	TCHAR;
+typedef	signed char		CHAR;
+typedef	signed short		SHORT;
+typedef	signed int		INT;
+typedef	signed long		LONG;
+
+typedef	unsigned char		UCHAR;
+typedef	unsigned short		USHORT;
+typedef	unsigned int		UINT;
+typedef	unsigned long		ULONG;
+
+typedef	signed char		SINT8;
+typedef	signed short		SINT16;
+typedef	signed int		SINT32;
+typedef	signed long long	SINT64;
+
+typedef	unsigned char		UINT8;
+typedef	unsigned short		UINT16;
+typedef	unsigned int		UINT32;
+typedef	unsigned long long	UINT64;
+
+typedef	unsigned char		BYTE;
+typedef	unsigned short		WORD;
+typedef	unsigned int		DWORD;
 
-typedef	int		BOOL;
+typedef	unsigned char		TCHAR;
 
-#include "common.h"
-#include "milstr.h"
-#include "_memory.h"
-#include "rect.h"
-#include "lstarray.h"
-#include "trace.h"
+typedef	int			BOOL;
 
 #ifndef	TRUE
 #define	TRUE	1
@@ -111,15 +113,30 @@ typedef	int		BOOL;
 #define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
 #endif
 
+#ifndef	UNUSED
 #define	UNUSED(v)	((void)(v))
-#define	INLINE		__inline
+#endif
+
+#define	FASTCALL
 #define	SOUNDCALL
+#define	MEMCALL
+#define	CPUCALL
 
 #ifdef	DEBUG
+#define	INLINE
 #define	__ASSERT(s)	assert(s)
 #else
+#ifndef	__ASSERT
 #define	__ASSERT(s)
 #endif
+#ifndef	INLINE
+#define	INLINE		__inline
+#endif
+#endif
+
+#if defined(__GNUC__)
+#define	GCC_ATTR_PACKED	__attribute__((packed))
+#endif
 
 #ifndef	NELEMENTS
 #define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
@@ -130,14 +147,63 @@ UINT32 gettick();
 #define	GETRAND()	random()
 #define	SPRINTF		sprintf
 
+#if defined(CPUCORE_IA32)
+void toolkit_msgbox(const char *title, const char *msg);
+#define	msgbox(title, msg)	toolkit_msgbox(title, msg);
+
+#define	SUPPORT_PC9821
+#define	SUPPORT_CRT31KHZ
+#else
+#define	SUPPORT_CRT15KHZ
+#endif
+
+#if defined(i386) || defined(__i386__)
+#undef	MEMOPTIMIZE
+#define LOADINTELDWORD(a)	(*((UINT32 *)(a)))
+#define LOADINTELWORD(a)	(*((UINT16 *)(a)))
+#define STOREINTELDWORD(a, b)	*(UINT32 *)(a) = (b)
+#define STOREINTELWORD(a, b)	*(UINT16 *)(a) = (b)
+#if defined(__GNUC__) && defined(IA32_USE_GCC_ATTR_REGPARM)
+#define	GCC_ATTR_REGPARM	__attribute__((regparm(2)))
+#endif
+#elif defined(arm) || defined (__arm__)
+#define	MEMOPTIMIZE	2
+#define	REG8		UINT
+#define	REG16		UINT
+#define	OPNGENARM
+#else
 #define	MEMOPTIMIZE	1
+#endif
 
-#define	SUPPORT_8BPP
-#define	SUPPORT_24BPP
+#define	SUPPORT_EUC
+#define	SUPPORT_SJIS
+
+#undef	SUPPORT_8BPP
 #define	SUPPORT_16BPP
+#define	SUPPORT_24BPP
 #define	SUPPORT_32BPP
 #define	SUPPORT_NORMALDISP
 
+#define	SUPPORT_PC9861K
+#define	SUPPORT_HOSTDRV
+
+#undef	SUPPORT_SASI
+#undef	SUPPORT_SCSI
+#undef	SUPPORT_IDE
+
+#if USE_GTK > 0
+#define	SUPPORT_S98
+#define	SUPPORT_KEYDISP
+#endif
+
+#if USE_SDL > 0
+#define	USE_SYSMENU
+#define	SCREEN_BPP	16
+#undef	SUPPORT_8BPP
+#undef	SUPPORT_24BPP
+#undef	SUPPORT_32BPP
+#endif
+
 /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and
  * then specify the library directory in the configuration file.
@@ -145,4 +211,11 @@ UINT32 gettick();
 extern char timidity_cfgfile_path[MAX_PATH];
 #define	TIMIDITY_CFGFILE	timidity_cfgfile_path
 
+#include "common.h"
+#include "milstr.h"
+#include "_memory.h"
+#include "rect.h"
+#include "lstarray.h"
+#include "trace.h"
+
 #endif	/* NP2_X11_COMPILER_H__ */