--- np2/x11/compiler.h	2007/01/23 15:48:20	1.34
+++ np2/x11/compiler.h	2008/03/18 15:45:05	1.37
@@ -1,4 +1,4 @@
-/*	$Id: compiler.h,v 1.34 2007/01/23 15:48:20 monaka Exp $	*/
+/*	$Id: compiler.h,v 1.37 2008/03/18 15:45:05 monaka Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2004 NONAKA Kimihiro
@@ -66,8 +66,6 @@
 #define	OSLANG_EUC
 #define	OSLINEBREAK_LF
 
-#if (USE_GTK2 > 0)
-
 #include <glib.h>
 
 typedef	gint32		SINT;
@@ -91,28 +89,6 @@ 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_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_GTK2 > 0 */
-
 #ifndef	TRUE
 #define	TRUE	1
 #endif
@@ -179,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,8 +180,7 @@ UINT32 gettick(void);
 #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
@@ -221,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
@@ -247,27 +218,20 @@ 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_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
 
-#if (USE_SDL > 0) || defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
+#if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
 #define	SUPPORT_JOYSTICK
 #define	USE_SDL_JOYSTICK
-#endif	/* USE_SDL > 0 || USE_SDLAUDIO || USE_SDLMIXER */
+#endif	/* USE_SDLAUDIO || USE_SDLMIXER */
 
 /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and
@@ -282,5 +246,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__ */