--- np2/common.h	2004/01/27 10:55:46	1.7
+++ np2/common.h	2004/06/20 00:56:26	1.10
@@ -35,7 +35,7 @@ enum {
 // ---- Optimize Macros
 
 #ifndef REG8
-#define	REG8		BYTE
+#define	REG8		UINT8
 #endif
 #ifndef REG16
 #define	REG16		UINT16
@@ -57,6 +57,18 @@ enum {
 #define	HIGH16(a)				(((UINT32)(a)) >> 16)
 #endif
 
+
+#if !defined(OEMCHAR)
+#define	OEMCHAR					char
+#endif
+#if !defined(OEMLITERAL)
+#define	OEMTEXT(string)			(string)
+#endif
+#if !defined(OEMNULL)
+#define	OEMNULLSTR				OEMTEXT("")
+#endif
+
+
 #ifndef STRLITERAL
 #ifdef UNICODE
 #define	STRLITERAL(string)		_T(string)
@@ -72,24 +84,26 @@ enum {
 #if !defined(RGB32)
 #if defined(BYTESEX_LITTLE)
 typedef union {
+	UINT32	d;
 	struct {
 		UINT8	b;
 		UINT8	g;
 		UINT8	r;
 		UINT8	e;
 	} p;
-	UINT32	d;
 } RGB32;
+#define	RGB32D(r, g, b)		(((r) << 16) + ((g) << 8) + ((b) << 0))
 #elif defined(BYTESEX_BIG)
 typedef union {
+	UINT32	d;
 	struct {
 		UINT8	e;
 		UINT8	r;
 		UINT8	g;
 		UINT8	b;
 	} p;
-	UINT32	d;
 } RGB32;
+#define	RGB32D(r, g, b)		(((r) << 16) + ((g) << 8) + ((b) << 0))
 #endif
 #endif
 
@@ -115,3 +129,11 @@ enum {
 	FTYPE_USER
 };
 
+
+#if !defined(INLINE)
+#define	INLINE
+#endif
+#if !defined(FASTCALL)
+#define	FASTCALL
+#endif
+