--- np2/sdl/win32s/compiler.h	2005/02/11 21:17:22	1.7
+++ np2/sdl/win32s/compiler.h	2005/04/01 15:35:49	1.10
@@ -10,24 +10,25 @@
 
 
 #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
 
-#define	BRESULT				UINT8
+#define	BRESULT				UINT
 #define	OEMCHAR				char
-#define	OEMTEXT(string)		(string)
+#define	OEMTEXT(string)		string
 #define	OEMSPRINTF			sprintf
 #define	OEMSTRLEN			strlen
 
@@ -39,7 +40,6 @@ typedef	signed int		SINT32;
 
 #include	"common.h"
 #include	"milstr.h"
-#include	"codecnv.h"
 #include	"_memory.h"
 #include	"rect.h"
 #include	"lstarray.h"