--- a/lib64gfx.h	Sat Nov 03 02:40:07 2012 +0200
+++ b/lib64gfx.h	Sat Nov 03 02:41:15 2012 +0200
@@ -63,7 +63,7 @@
 // RGBx color struct
 typedef struct
 {
-    uint8_t r, g, b, x;
+    Uint8 r, g, b, x;
 } DMColor;
 
 
@@ -74,7 +74,7 @@
     BOOL constpal;
     int ncolors, ctrans;
     DMColor *pal;
-    uint8_t *data;
+    Uint8 *data;
 } DMImage;
 
 
@@ -102,7 +102,7 @@
 {
     BOOL multicolor, xexpand, yexpand;
     int color, xc, yc;
-    uint8_t data[C64_SPR_HEIGHT][C64_SPR_WIDTH];
+    Uint8 data[C64_SPR_HEIGHT][C64_SPR_WIDTH];
 } DMC64Sprite;
 
 
@@ -114,13 +114,13 @@
         fliLines, // FLI on every # line
         laceBank2;
 
-    uint8_t color[C64_SCR_MAX_BANK][C64_SCR_COLOR_SIZE],
+    Uint8 color[C64_SCR_MAX_BANK][C64_SCR_COLOR_SIZE],
             bitmap[C64_SCR_MAX_BANK][C64_SCR_BITMAP_SIZE],
             screen[C64_SCR_MAX_BANK][C64_SCR_SCREEN_SIZE],
             extradata[C64_SCR_EXTRADATA],
             d020, bgcolor, d022, d023, d024;
 
-    uint8_t charset[C64_MAX_CHARS][C64_CHR_HEIGHT * C64_CHR_WIDTH];
+    Uint8 charset[C64_MAX_CHARS][C64_CHR_HEIGHT * C64_CHR_WIDTH];
     DMC64Sprite sprites[C64_MAX_SPRITES];
 } DMC64Image;
 
@@ -145,7 +145,7 @@
     size_t offs;
     int    bank;
     size_t size;
-    BOOL   (*function)(DMC64Image *img, const struct _DMDecodeOp *op, const uint8_t *buf, const size_t len);
+    BOOL   (*function)(DMC64Image *img, const struct _DMDecodeOp *op, const Uint8 *buf, const size_t len);
 } DMDecodeOp;
 
 
@@ -154,8 +154,8 @@
     int  type;
     char *extension;
     char *name;
-    int  (*probe)(const uint8_t *buf, const size_t len);
-    int  (*decode)(DMC64Image *img, const uint8_t *buf, const size_t len, const struct _DMC64ImageFormat *fmt);
+    int  (*probe)(const Uint8 *buf, const size_t len);
+    int  (*decode)(DMC64Image *img, const Uint8 *buf, const size_t len, const struct _DMC64ImageFormat *fmt);
     int  (*convert)(DMImage *, DMC64Image *);
 
     int ndecodeOps;
@@ -175,10 +175,10 @@
 int       dmImageGetBytesPerPixel(int format);
 
 
-int       dmC64ConvertCSData(DMImage *img, int xoffs, int yoffs, const uint8_t *inBuf, int width, int height, BOOL multicolor, int *colors);
-int       dmC64ProbeGeneric(const uint8_t *buf, const size_t len, DMC64ImageFormat **fmt);
-int       dmC64DecodeGenericBMP(DMC64Image *img, const uint8_t *buf, const size_t len, const DMC64ImageFormat *fmt);
+int       dmC64ConvertCSData(DMImage *img, int xoffs, int yoffs, const Uint8 *inBuf, int width, int height, BOOL multicolor, int *colors);
+int       dmC64ProbeGeneric(const Uint8 *buf, const size_t len, DMC64ImageFormat **fmt);
+int       dmC64DecodeGenericBMP(DMC64Image *img, const Uint8 *buf, const size_t len, const DMC64ImageFormat *fmt);
 int       dmC64ConvertGenericBMP2Image(DMImage *screen, const DMC64Image *img);
-int       dmReadDataFile(const char *filename, uint8_t **buf, size_t *size);
+int       dmReadDataFile(const char *filename, Uint8 **buf, size_t *size);
 
 #endif // LIB64GFX_H