--- np2/x11/compiler.h	2003/10/16 17:59:40	1.1
+++ np2/x11/compiler.h	2003/11/16 16:43:45	1.2
@@ -1,33 +1,82 @@
-#include	<sys/param.h>
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<stdarg.h>
-#include	<stddef.h>
-#include	<string.h>
-#include	<unistd.h>
-#include	<assert.h>
-#include	<pthread.h>
-#include	<SDL.h>
+#ifndef	NP2_X11_COMPILER_H__
+#define	NP2_X11_COMPILER_H__
+
+#if defined(USE_NETBSDAUDIO) && !defined(__NetBSD__)
+#undef	USE_NETBSDAUDIO
+#endif
+
+#if !defined(USE_NETBSDAUDIO) && !defined(USE_OSSAUDIO) && !defined(USE_ESDAUDIO) && !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER)
+#ifndef	NOSOUND
+#define	NOSOUND
+#endif	/* !NOSOUND */
+#else	/* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO || USE_SDLAUDIO || USE_SDLMIXER */
+#undef	NOSOUND
+#endif	/* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */
+
+#ifdef	WORDS_BIGENDIAN
+#define	BYTESEX_BIG
+#else	/* !WORDS_BIGENDIAN */
+#define	BYTESEX_LITTLE
+#endif	/* WORDS_BIGENDIAN */
+
+#if defined(NOSOUND)
+
+#undef	VERMOUTH_LIB
+#undef	SOUND_CRITICAL
+#undef	SOUNDRESERVE
+
+#else	/* !NOSOUND */
+
+#include <pthread.h>
+
+#define	VERMOUTH_LIB
+#undef	SOUND_CRITICAL
+#define	SOUNDRESERVE	100
+
+#endif  /* NOSOUND */
+
+#include <sys/param.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+#include <unistd.h>
 
 #define	X11
 
-typedef	signed char		CHAR;
-typedef	signed int		INT;
+typedef	signed char	CHAR;
+typedef	signed short	SHORT;
+typedef	signed int	INT;
+typedef	signed long	LONG;
 
 typedef	unsigned char	UCHAR;
 typedef	unsigned short	USHORT;
 typedef	unsigned int	UINT;
 typedef	unsigned long	ULONG;
 
-typedef	short			SINT16;
+typedef	signed char	SINT8;
+typedef	signed short	SINT16;
+typedef	signed int	SINT32;
+
+typedef	unsigned char	UINT8;
 typedef	unsigned short	UINT16;
-typedef	int				SINT32;
 typedef	unsigned int	UINT32;
 
 typedef	unsigned char	BYTE;
 typedef	unsigned char	TCHAR;
 
-typedef	int				BOOL;
+typedef	int		BOOL;
+
+#include "common.h"
+#include "milstr.h"
+#include "_memory.h"
+#include "rect.h"
+#include "lstarray.h"
+#include "trace.h"
 
 #ifndef	TRUE
 #define	TRUE	1
@@ -49,56 +98,55 @@ typedef	int				BOOL;
 #endif
 
 #ifndef	ZeroMemory
-#define	ZeroMemory(d,n)		bzero((d),(n))
+#define	ZeroMemory(d,n)		memset((d), 0, (n))
 #endif
 #ifndef	CopyMemory
-#define	CopyMemory(d,s,n)	memcpy((d),(s),(n))
+#define	CopyMemory(d,s,n)	memcpy((d), (s), (n))
 #endif
 #ifndef	FillMemory
-#define	FillMemory(a, b, c)	memset((a),(c),(b))
+#define	FillMemory(a, b, c)	memset((a), (c), (b))
 #endif
 
 #ifndef	roundup
 #define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
 #endif
 
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-#define	BYTESEX_BIG
-#else /* SDL_BYTEORDER == SDL_LIL_ENDIAN */
-#define	BYTESEX_LITTLE
-#endif	/* SDL_BYTEORDER == SDL_BIG_ENDIAN */
+#define	UNUSED(v)	((void)(v))
+#define	INLINE		__inline
+#define	SOUNDCALL
 
+#ifdef	DEBUG
 #define	__ASSERT(s)	assert(s)
-
-#define	UNUSED(v)	((void)(v))
+#else
+#define	__ASSERT(s)
+#endif
 
 #ifndef	NELEMENTS
 #define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
 #endif
 
-#include	"common.h"
-#include	"milstr.h"
-#include	"_memory.h"
-#include	"rect.h"
-#include	"lstarray.h"
-#include	"trace.h"
-
-#define	GETTICK()	SDL_GetTicks()
+UINT32 gettick();
+#define	GETTICK()	gettick()
 #define	GETRAND()	random()
-#define	SPRINTF		wsprintf
+#define	SPRINTF		sprintf
 
-#define	VERMOUTH_LIB
-// #define	SOUND_CRITICAL
+#define	MEMOPTIMIZE	1
 
 #define	SUPPORT_8BPP
 #define	SUPPORT_24BPP
 #define	SUPPORT_16BPP
 #define	SUPPORT_32BPP
-#define SUPPORT_NORMALDISP
-// #define	MEMOPTIMIZE		1
+#define	SUPPORT_NORMALDISP
 
+/*
+ * You could specify a complete path, e.g. "/etc/timidity.cfg", and
+ * then specify the library directory in the configuration file.
+ */
+#ifndef	TIMIDITY_CFGFILE_PATH
+#define	TIMIDITY_CFGFILE_PATH	"timidity.cfg"
+#endif
 
-// You could specify a complete path, e.g. "/etc/timidity.cfg", and
-// then specify the library directory in the configuration file.
-// #define TIMIDITY_CFGFILE	"timidity.cfg"
+extern char timidity_cfgfile_path[MAX_PATH];
+#define	TIMIDITY_CFGFILE	timidity_cfgfile_path
 
+#endif	/* NP2_X11_COMPILER_H__ */