--- np2/common.h 2003/11/30 12:32:04 1.5 +++ np2/common.h 2003/12/08 00:55:30 1.6 @@ -32,7 +32,7 @@ enum { #endif -// Optimize Macros +// ---- Optimize Macros #ifndef REG8 #define REG8 BYTE @@ -40,9 +40,6 @@ enum { #ifndef REG16 #define REG16 UINT16 #endif -#ifndef REG32 -#define REG32 UINT32 -#endif #ifndef LOW12 #define LOW12(a) ((a) & 0x0fff) @@ -76,20 +73,20 @@ enum { #if defined(BYTESEX_LITTLE) typedef union { struct { - BYTE b; - BYTE g; - BYTE r; - BYTE e; + UINT8 b; + UINT8 g; + UINT8 r; + UINT8 e; } p; UINT32 d; } RGB32; #elif defined(BYTESEX_BIG) typedef union { struct { - BYTE e; - BYTE r; - BYTE g; - BYTE b; + UINT8 e; + UINT8 r; + UINT8 g; + UINT8 b; } p; UINT32 d; } RGB32;