--- np2/x11/compiler.h	2003/11/16 16:43:45	1.2
+++ np2/x11/compiler.h	2003/12/11 15:11:56	1.7
@@ -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
@@ -39,6 +39,7 @@
 #include <sys/time.h>
 #include <assert.h>
 #include <fcntl.h>
+#include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -47,29 +48,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	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	unsigned char	BYTE;
-typedef	unsigned char	TCHAR;
+typedef	unsigned char		TCHAR;
 
-typedef	int		BOOL;
+typedef	int			BOOL;
 
 #include "common.h"
 #include "milstr.h"
@@ -113,7 +121,10 @@ typedef	int		BOOL;
 
 #define	UNUSED(v)	((void)(v))
 #define	INLINE		__inline
+#define	FASTCALL
 #define	SOUNDCALL
+#define	MEMCALL
+#define	CPUCALL
 
 #ifdef	DEBUG
 #define	__ASSERT(s)	assert(s)
@@ -130,7 +141,15 @@ UINT32 gettick();
 #define	GETRAND()	random()
 #define	SPRINTF		sprintf
 
+#if defined(i386) || defined(__i386__)
+#undef	MEMOPTIMIZE
+#elif defined(arm) || defined (__arm__)
+#define	MEMOPTIMIZE	2
+#else
 #define	MEMOPTIMIZE	1
+#endif
+
+#define	SUPPORT_EUC
 
 #define	SUPPORT_8BPP
 #define	SUPPORT_24BPP
@@ -138,14 +157,14 @@ UINT32 gettick();
 #define	SUPPORT_32BPP
 #define	SUPPORT_NORMALDISP
 
+#if defined(USE_GTK)
+#define	SUPPORT_KEYDISP
+#endif
+
 /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and
  * then specify the library directory in the configuration file.
  */
-#ifndef	TIMIDITY_CFGFILE_PATH
-#define	TIMIDITY_CFGFILE_PATH	"timidity.cfg"
-#endif
-
 extern char timidity_cfgfile_path[MAX_PATH];
 #define	TIMIDITY_CFGFILE	timidity_cfgfile_path