--- np2/x11/compiler.h	2007/01/20 22:33:06	1.33
+++ np2/x11/compiler.h	2011/01/15 14:25:22	1.39
@@ -1,4 +1,4 @@
-/*	$Id: compiler.h,v 1.33 2007/01/20 22:33:06 monaka Exp $	*/
+/*	$Id: compiler.h,v 1.39 2011/01/15 14:25:22 monaka Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2004 NONAKA Kimihiro
@@ -39,22 +39,15 @@
 #define	BYTESEX_LITTLE
 #endif	/* WORDS_BIGENDIAN */
 
-#if defined(USE_NETBSDAUDIO) && !defined(__NetBSD__)
-#undef	USE_NETBSDAUDIO
-#endif
-
-#if !defined(USE_NETBSDAUDIO) && !defined(USE_OSSAUDIO) && !defined(USE_ESDAUDIO) && !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER)
+#if !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER)
 #ifndef	NOSOUND
 #define	NOSOUND
 #undef	VERMOUTH_LIB
 #endif	/* !NOSOUND */
-#else	/* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO || USE_SDLAUDIO || USE_SDLMIXER */
+#else	/* USE_SDLAUDIO || USE_SDLMIXER */
 #undef	NOSOUND
 #define	VERMOUTH_LIB
-#if defined(USE_NETBSDAUDIO) || defined(USE_OSSAUDIO) || defined(USE_ESDAUDIO)
-#include <pthread.h>
-#endif	/* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO */
-#endif	/* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */
+#endif	/* !USE_SDLAUDIO && !USE_SDLMIXER */
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -73,9 +66,7 @@
 #define	OSLANG_EUC
 #define	OSLINEBREAK_LF
 
-#if USE_GTK > 0 || USE_GTK2 > 0
-
-#include "glib.h"
+#include <glib.h>
 
 typedef	gint32		SINT;
 typedef	guint32		UINT;
@@ -98,36 +89,14 @@ typedef	gboolean	BOOL;
 #define PTR_TO_UINT32(p)	((UINT32)GPOINTER_TO_UINT(p))
 #define UINT32_TO_PTR(v)	GUINT_TO_POINTER((UINT32)(v))
 
-#else	/* USE_GTK == 0 && USE_GTK2 == 0 */
-
-typedef	signed int		SINT;
-typedef	unsigned int		UINT;
-
-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	char			TCHAR;
-
-typedef	int			BOOL;
-
-#endif	/* USE_GTK > 0 || USE_GTK2 > 0 */
-
-#ifndef	TRUE
-#define	TRUE	1
-#endif
-
 #ifndef	FALSE
 #define	FALSE	0
 #endif
 
+#ifndef	TRUE
+#define	TRUE	(!FALSE)
+#endif
+
 #ifndef	MAX_PATH
 #define	MAX_PATH	MAXPATHLEN
 #endif
@@ -170,7 +139,7 @@ typedef	int			BOOL;
 #define	__ASSERT(s)
 #endif
 #ifndef	INLINE
-#define	INLINE		__inline
+#define	INLINE		inline
 #endif
 #endif
 
@@ -186,7 +155,6 @@ typedef	int			BOOL;
 #endif /* i386 */
 
 #if defined(__GNUC__)
-#define	GCC_ATTR_PACKED	__attribute__((packed))
 #if defined(NP2_CPU_ARCH_IA32)
 #define	GCC_CPU_ARCH_IA32
 #endif
@@ -205,15 +173,14 @@ UINT32 gettick(void);
 #define	SPRINTF		sprintf
 #define	STRLEN		strlen
 
-#define	OEMCHAR		char
+#define	OEMCHAR		gchar
 #define OEMTEXT(s)	s
 #define OEMNULLSTR	OEMTEXT("")
 #define	OEMSPRINTF	sprintf
 #define	OEMSTRLEN	strlen
 
 #if defined(CPUCORE_IA32)
-void toolkit_msgbox(const char *title, const char *msg);
-#define	msgbox(title, msg)	toolkit_msgbox(title, msg);
+#define	msgbox(title, msg)	toolkit_messagebox(title, msg);
 
 #define	SUPPORT_PC9821
 #define	SUPPORT_CRT31KHZ
@@ -228,9 +195,6 @@ void toolkit_msgbox(const char *title, c
 #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
@@ -254,33 +218,22 @@ void toolkit_msgbox(const char *title, c
 #define	SUPPORT_PC9861K
 #define	SUPPORT_HOSTDRV
 
+#define	SUPPORT_RESUME
+#define	SUPPORT_STATSAVE
+
 #undef	SUPPORT_SASI
 #undef	SUPPORT_SCSI
 
-#if USE_GTK > 0 || USE_GTK2 > 0
 #define	SUPPORT_S98
 #define	SUPPORT_KEYDISP
 #define	SUPPORT_SOFTKBD	0
-#endif
 
-#if USE_SDL > 0
-#define	USE_SYSMENU
-#define	SCREEN_BPP	16
-#undef	SUPPORT_8BPP
-#undef	SUPPORT_24BPP
-#undef	SUPPORT_32BPP
-#endif
+#define	SUPPORT_SCREENSIZE
 
-#if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)
+#if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
 #define	SUPPORT_JOYSTICK
-
-#if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)
 #define	USE_SDL_JOYSTICK
-#else
-#error	unknown joystick driver!!!
-#endif
-
-#endif
+#endif	/* USE_SDLAUDIO || USE_SDLMIXER */
 
 /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and
@@ -295,5 +248,6 @@ extern char timidity_cfgfile_path[MAX_PA
 #include "rect.h"
 #include "lstarray.h"
 #include "trace.h"
+#include "toolkit.h"
 
 #endif	/* NP2_X11_COMPILER_H__ */