--- np2/x11/compiler.h	2008/02/07 14:37:30	1.35
+++ np2/x11/compiler.h	2011/12/21 17:34:06	1.43
@@ -1,5 +1,3 @@
-/*	$Id: compiler.h,v 1.35 2008/02/07 14:37:30 monaka Exp $	*/
-
 /*-
  * Copyright (c) 2003, 2004 NONAKA Kimihiro
  * All rights reserved.
@@ -33,6 +31,25 @@
 #include "config.h"
 #endif
 
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(s)				gettext(s)
+#ifdef gettext_noop
+#define N_(s)				gettext_noop(s)
+#else
+#define N_(s)				(s)
+#endif
+#else /* !ENABLE_NLS */
+#define _(s)				(s)
+#define N_(s) (s)
+#define textdomain(s)			(s)
+#define gettext(s)			(s)
+#define dgettext(d,s)			(s)
+#define dcgettext(d,s,t)		(s)
+#define bindtextdomain(d,dir)		(d)
+#define bind_textdomain_codeset(d,c)	(c)
+#endif /* ENABLE_NLS */
+
 #ifdef	WORDS_BIGENDIAN
 #define	BYTESEX_BIG
 #else	/* !WORDS_BIGENDIAN */
@@ -66,8 +83,6 @@
 #define	OSLANG_EUC
 #define	OSLINEBREAK_LF
 
-#if (USE_GTK2 > 0)
-
 #include <glib.h>
 
 typedef	gint32		SINT;
@@ -91,36 +106,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_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
-
 #ifndef	FALSE
 #define	FALSE	0
 #endif
 
+#ifndef	TRUE
+#define	TRUE	(!FALSE)
+#endif
+
 #ifndef	MAX_PATH
 #define	MAX_PATH	MAXPATHLEN
 #endif
@@ -146,10 +139,6 @@ typedef	int			BOOL;
 #define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
 #endif
 
-#ifndef	UNUSED
-#define	UNUSED(v)	((void)(v))
-#endif
-
 #define	FASTCALL
 #define	SOUNDCALL
 #define	MEMCALL
@@ -197,18 +186,19 @@ 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);
 
+#if !defined(DISABLE_PC9821)
 #define	SUPPORT_PC9821
 #define	SUPPORT_CRT31KHZ
+#endif
 #define	SUPPORT_IDEIO
 #else
 #define	SUPPORT_CRT15KHZ
@@ -243,27 +233,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_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(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
@@ -278,5 +263,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__ */