--- np2/x11/compiler.h	2008/03/13 16:27:39	1.36
+++ np2/x11/compiler.h	2011/12/21 17:34:06	1.43
@@ -1,5 +1,3 @@
-/*	$Id: compiler.h,v 1.36 2008/03/13 16:27:39 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 */
@@ -89,14 +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))
 
-#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
@@ -122,10 +139,6 @@ typedef	gboolean	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
@@ -173,7 +186,7 @@ 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
@@ -182,8 +195,10 @@ UINT32 gettick(void);
 #if defined(CPUCORE_IA32)
 #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
@@ -228,6 +243,8 @@ UINT32 gettick(void);
 #define	SUPPORT_KEYDISP
 #define	SUPPORT_SOFTKBD	0
 
+#define	SUPPORT_SCREENSIZE
+
 #if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
 #define	SUPPORT_JOYSTICK
 #define	USE_SDL_JOYSTICK
@@ -246,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__ */