--- np2/i286c/i286c.mcr	2003/10/16 17:57:37	1.1
+++ np2/i286c/i286c.mcr	2003/10/17 11:10:02	1.3
@@ -1,7 +1,7 @@
 
 #define	INHIBIT_WORDP(m)	(1)
 
-#define	__CBW(src)		(WORD)((char)(src))
+#define	__CBW(src)		(UINT16)((char)(src))
 #define	__CBD(src)		((char)(src))
 #define	WORD2LONG(src)	((short)(src))
 
@@ -361,7 +361,7 @@
 
 
 #define	SP_PUSH(reg, clock)	{										\
-		WORD sp = reg;												\
+		UINT16 sp = reg;											\
 		I286_SP -= 2;												\
 		i286_memorywrite_w(I286_SP + SS_BASE, sp);					\
 		I286_CLOCK(clock);											\