--- np2/mona/win32s/compiler.h	2005/02/04 05:45:47	1.1
+++ np2/mona/win32s/compiler.h	2005/02/12 12:13:59	1.2
@@ -1,6 +1,10 @@
 #include	<windows.h>
+#include	<tchar.h>
 #include	<stdio.h>
 #include	<stddef.h>
+#if defined(TRACE)
+#include	<assert.h>
+#endif
 #include	<SDL.h>
 #include	"memmng.h"
 
@@ -9,40 +13,62 @@
 #define	OSLANG_SJIS
 #define	OSLINEBREAK_CRLF
 
-
 #ifndef __GNUC__
-typedef	signed char		SINT8;
-typedef	unsigned char	UINT8;
-typedef	signed short	SINT16;
-typedef	unsigned short	UINT16;
-typedef	signed int		SINT32;
-typedef	unsigned int	UINT32;
+typedef	signed int			SINT;
+typedef	signed char			SINT8;
+typedef	unsigned char		UINT8;
+typedef	signed short		SINT16;
+typedef	unsigned short		UINT16;
+typedef	signed int			SINT32;
+typedef	unsigned int		UINT32;
 #else
 #include	<stdlib.h>
-typedef	signed char		SINT8;
-typedef	unsigned char	UINT8;
-typedef	signed short	SINT16;
-typedef	unsigned short	UINT16;
-typedef	signed int		SINT32;
+typedef	signed char			SINT8;
+typedef	unsigned char		UINT8;
+typedef	signed short		SINT16;
+typedef	unsigned short		UINT16;
+typedef	signed int			SINT32;
 #endif
 
+// for x86
+#define	LOADINTELDWORD(a)		(*((UINT32 *)(a)))
+#define	LOADINTELWORD(a)		(*((UINT16 *)(a)))
+#define	STOREINTELDWORD(a, b)	*(UINT32 *)(a) = (b)
+#define	STOREINTELWORD(a, b)	*(UINT16 *)(a) = (b)
+
+#define	STRCALL		__stdcall
+
+#define	BRESULT				UINT8
+#define	OEMCHAR				TCHAR
+#define	OEMTEXT(string)		_T(string)
+#define	OEMSPRINTF			wsprintf
+#define	OEMSTRLEN			lstrlen
+
 
 #include	"common.h"
 #include	"milstr.h"
-#include	"codecnv.h"
 #include	"_memory.h"
 #include	"rect.h"
 #include	"lstarray.h"
 #include	"trace.h"
 
 
-#define	GETTICK()	SDL_GetTicks()
-#define	SPRINTF		sprintf
+#define	GETTICK()			SDL_GetTicks()
+#if defined(TRACE)
+#define	__ASSERT(s)			assert(s)
+#else
 #define	__ASSERT(s)
+#endif
+#if defined(UNICODE)
+#define	SPRINTF				sprintf
+#define	STRLEN				strlen
+#else
+#define	SPRINTF				wsprintf
+#define	STRLEN				lstrlen
+#endif
 
 #define	LABEL				__declspec(naked)
-#define RELEASE(x) 			if (x) {(x)->Release(); (x) = NULL;}
-
+#define	RELEASE(x) 			if (x) {(x)->Release(); (x) = NULL;}
 
 #define	DISABLE_SOUND
 // #define	VERMOUTH_LIB
@@ -50,10 +76,10 @@ typedef	signed int		SINT32;
 #define	PARTSCALL	__fastcall
 #define	CPUCALL		__fastcall
 #define	MEMCALL		__fastcall
-#define DMACCALL	__fastcall
+#define	DMACCALL	__fastcall
 #define	IOOUTCALL	__fastcall
 #define	IOINPCALL	__fastcall
-#define SOUNDCALL	__fastcall
+#define	SOUNDCALL	__fastcall
 #define	VRAMCALL	__fastcall
 #define	SCRNCALL	__fastcall