--- np2/x11/compiler.h	2004/07/26 15:53:26	1.24
+++ np2/x11/compiler.h	2007/01/20 22:33:06	1.33
@@ -1,4 +1,4 @@
-/*	$Id: compiler.h,v 1.24 2004/07/26 15:53:26 monaka Exp $	*/
+/*	$Id: compiler.h,v 1.33 2007/01/20 22:33:06 monaka Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2004 NONAKA Kimihiro
@@ -29,6 +29,10 @@
 #ifndef	NP2_X11_COMPILER_H__
 #define	NP2_X11_COMPILER_H__
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef	WORDS_BIGENDIAN
 #define	BYTESEX_BIG
 #else	/* !WORDS_BIGENDIAN */
@@ -73,6 +77,7 @@
 
 #include "glib.h"
 
+typedef	gint32		SINT;
 typedef	guint32		UINT;
 
 typedef	gint8		SINT8;
@@ -90,8 +95,12 @@ typedef	gchar		TCHAR;
 
 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;
@@ -194,6 +203,13 @@ UINT32 gettick(void);
 #define	GETTICK()	gettick()
 #define	GETRAND()	random()
 #define	SPRINTF		sprintf
+#define	STRLEN		strlen
+
+#define	OEMCHAR		char
+#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);
@@ -201,6 +217,7 @@ void toolkit_msgbox(const char *title, c
 
 #define	SUPPORT_PC9821
 #define	SUPPORT_CRT31KHZ
+#define	SUPPORT_IDEIO
 #else
 #define	SUPPORT_CRT15KHZ
 #endif
@@ -224,7 +241,6 @@ void toolkit_msgbox(const char *title, c
 #endif
 
 #define	SUPPORT_EUC
-#define	SUPPORT_SJIS
 
 #undef	SUPPORT_8BPP
 #define	SUPPORT_16BPP
@@ -240,7 +256,6 @@ void toolkit_msgbox(const char *title, c
 
 #undef	SUPPORT_SASI
 #undef	SUPPORT_SCSI
-#undef	SUPPORT_IDEIO
 
 #if USE_GTK > 0 || USE_GTK2 > 0
 #define	SUPPORT_S98