--- np2/x11/compiler.h	2004/06/17 14:36:33	1.21
+++ np2/x11/compiler.h	2004/07/28 13:52:27	1.25
@@ -1,4 +1,4 @@
-/*	$Id: compiler.h,v 1.21 2004/06/17 14:36:33 monaka Exp $	*/
+/*	$Id: compiler.h,v 1.25 2004/07/28 13:52:27 monaka Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2004 NONAKA Kimihiro
@@ -47,6 +47,9 @@
 #else	/* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO || 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 */
 
 #include <sys/param.h>
@@ -66,15 +69,30 @@
 #define	OSLANG_EUC
 #define	OSLINEBREAK_LF
 
-typedef	signed char		CHAR;
-typedef	signed short		SHORT;
-typedef	signed int		INT;
-typedef	signed long		LONG;
+#if USE_GTK > 0 || USE_GTK2 > 0
+
+#include "glib.h"
+
+typedef	guint32		UINT;
+
+typedef	gint8		SINT8;
+typedef	gint16		SINT16;
+typedef	gint32		SINT32;
+typedef	gint64		SINT64;
+
+typedef	guint8		UINT8;
+typedef	guint16		UINT16;
+typedef	guint32		UINT32;
+typedef	guint64		UINT64;
+
+typedef	guint8		BYTE;
+typedef	gchar		TCHAR;
+
+typedef	gboolean	BOOL;
+
+#else	/* USE_GTK == 0 && USE_GTK2 == 0 */
 
-typedef	unsigned char		UCHAR;
-typedef	unsigned short		USHORT;
 typedef	unsigned int		UINT;
-typedef	unsigned long		ULONG;
 
 typedef	signed char		SINT8;
 typedef	signed short		SINT16;
@@ -87,13 +105,12 @@ typedef	unsigned int		UINT32;
 typedef	unsigned long long	UINT64;
 
 typedef	unsigned char		BYTE;
-typedef	unsigned short		WORD;
-typedef	unsigned int		DWORD;
-
-typedef	unsigned char		TCHAR;
+typedef	char			TCHAR;
 
 typedef	int			BOOL;
 
+#endif	/* USE_GTK > 0 || USE_GTK2 > 0 */
+
 #ifndef	TRUE
 #define	TRUE	1
 #endif
@@ -173,7 +190,7 @@ typedef	int			BOOL;
 #define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
 #endif
 
-UINT32 gettick();
+UINT32 gettick(void);
 #define	GETTICK()	gettick()
 #define	GETRAND()	random()
 #define	SPRINTF		sprintf
@@ -181,6 +198,9 @@ UINT32 gettick();
 #if defined(CPUCORE_IA32)
 void toolkit_msgbox(const char *title, const char *msg);
 #define	msgbox(title, msg)	toolkit_msgbox(title, msg);
+#ifndef	IA32_PAGING_EACHSIZE
+#define	IA32_PAGING_EACHSIZE
+#endif
 
 #define	SUPPORT_PC9821
 #define	SUPPORT_CRT31KHZ
@@ -225,7 +245,7 @@ void toolkit_msgbox(const char *title, c
 #undef	SUPPORT_SCSI
 #undef	SUPPORT_IDEIO
 
-#if USE_GTK > 0
+#if USE_GTK > 0 || USE_GTK2 > 0
 #define	SUPPORT_S98
 #define	SUPPORT_KEYDISP
 #define	SUPPORT_SOFTKBD	0
@@ -239,6 +259,17 @@ void toolkit_msgbox(const char *title, c
 #undef	SUPPORT_32BPP
 #endif
 
+#if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)
+#define	SUPPORT_JOYSTICK
+
+#if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)
+#define	USE_SDL_JOYSTICK
+#else
+#error	unknown joystick driver!!!
+#endif
+
+#endif
+
 /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and
  * then specify the library directory in the configuration file.