--- np2/common/bmpdata.h	2003/11/21 06:51:10	1.2
+++ np2/common/bmpdata.h	2005/02/07 14:46:08	1.3
@@ -1,46 +1,46 @@
 
 #if defined(__GNUC__)
 typedef struct {
-	BYTE	bfType[2];
-	BYTE	bfSize[4];
-	BYTE	bfReserved1[2];
-	BYTE	bfReserved2[2];
-	BYTE	bfOffBits[4];
+	UINT8	bfType[2];
+	UINT8	bfSize[4];
+	UINT8	bfReserved1[2];
+	UINT8	bfReserved2[2];
+	UINT8	bfOffBits[4];
 } __attribute__ ((packed)) BMPFILE;
 typedef struct {
-	BYTE	biSize[4];
-	BYTE	biWidth[4];
-	BYTE	biHeight[4];
-	BYTE	biPlanes[2];
-	BYTE	biBitCount[2];
-	BYTE	biCompression[4];
-	BYTE	biSizeImage[4];
-	BYTE	biXPelsPerMeter[4];
-	BYTE	biYPelsPerMeter[4];
-	BYTE	biClrUsed[4];
-	BYTE	biClrImportant[4];
+	UINT8	biSize[4];
+	UINT8	biWidth[4];
+	UINT8	biHeight[4];
+	UINT8	biPlanes[2];
+	UINT8	biBitCount[2];
+	UINT8	biCompression[4];
+	UINT8	biSizeImage[4];
+	UINT8	biXPelsPerMeter[4];
+	UINT8	biYPelsPerMeter[4];
+	UINT8	biClrUsed[4];
+	UINT8	biClrImportant[4];
 } __attribute__ ((packed)) BMPINFO;
 #else
 #pragma pack(push, 1)
 typedef struct {
-	BYTE	bfType[2];
-	BYTE	bfSize[4];
-	BYTE	bfReserved1[2];
-	BYTE	bfReserved2[2];
-	BYTE	bfOffBits[4];
+	UINT8	bfType[2];
+	UINT8	bfSize[4];
+	UINT8	bfReserved1[2];
+	UINT8	bfReserved2[2];
+	UINT8	bfOffBits[4];
 } BMPFILE;
 typedef struct {
-	BYTE	biSize[4];
-	BYTE	biWidth[4];
-	BYTE	biHeight[4];
-	BYTE	biPlanes[2];
-	BYTE	biBitCount[2];
-	BYTE	biCompression[4];
-	BYTE	biSizeImage[4];
-	BYTE	biXPelsPerMeter[4];
-	BYTE	biYPelsPerMeter[4];
-	BYTE	biClrUsed[4];
-	BYTE	biClrImportant[4];
+	UINT8	biSize[4];
+	UINT8	biWidth[4];
+	UINT8	biHeight[4];
+	UINT8	biPlanes[2];
+	UINT8	biBitCount[2];
+	UINT8	biCompression[4];
+	UINT8	biSizeImage[4];
+	UINT8	biXPelsPerMeter[4];
+	UINT8	biYPelsPerMeter[4];
+	UINT8	biClrUsed[4];
+	UINT8	biClrImportant[4];
 } BMPINFO;
 #pragma pack(pop)
 #endif
@@ -61,10 +61,10 @@ UINT bmpdata_getdatasize(const BMPINFO *
 
 UINT bmpdata_sethead(BMPFILE *bf, const BMPINFO *bi);
 UINT bmpdata_setinfo(BMPINFO *bi, const BMPDATA *inf);
-BOOL bmpdata_getinfo(const BMPINFO *bi, BMPDATA *inf);
+BRESULT bmpdata_getinfo(const BMPINFO *bi, BMPDATA *inf);
 
-BYTE *bmpdata_lzx(int level, int dstsize, const BYTE *dat);
-BYTE *bmpdata_solvedata(const BYTE *dat);
+UINT8 *bmpdata_lzx(int level, int dstsize, const UINT8 *dat);
+UINT8 *bmpdata_solvedata(const UINT8 *dat);
 
 #ifdef __cplusplus
 }