--- Frodo4/Src/Display_svga.h	2003/07/01 17:32:13	1.1
+++ Frodo4/Src/Display_svga.h	2009/01/11 11:32:38	1.6
@@ -2,7 +2,7 @@
  *  Display_svga.h - C64 graphics display, emulator window handling,
  *                   SVGAlib specific stuff
  *
- *  Frodo (C) 1994-1997,2002 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2009 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -150,7 +150,7 @@ static int keystate[256];
 static int f11pressed = 0, f12pressed = 0, quit = 0;
 static int joystate = 0xFF;
 static int numlock = 0;
-static UBYTE rev_matrix[8], key_matrix[8];
+static uint8 rev_matrix[8], key_matrix[8];
 
 /*
   C64 keyboard matrix:
@@ -495,14 +495,14 @@ void C64Display::Update(void)
 	return;
     
     for (y = 0; y < DISPLAY_Y; y++) {
-	vga_drawscanline(y, bufmem + hsize * y);
+	vga_drawscanline(y, (uint8 *)bufmem + hsize * y);
     }
 }
 
 
-UBYTE *C64Display::BitmapBase(void)
+uint8 *C64Display::BitmapBase(void)
 {
-       return (UBYTE *)bufmem;
+       return (uint8 *)bufmem;
 }
 
 
@@ -512,7 +512,7 @@ int C64Display::BitmapXMod(void)
 }
 
 
-void C64Display::PollKeyboard(UBYTE *CIA_key_matrix, UBYTE *CIA_rev_matrix, UBYTE *joystick)
+void C64Display::PollKeyboard(uint8 *CIA_key_matrix, uint8 *CIA_rev_matrix, uint8 *joystick)
 {
     keyboard_update();
     *joystick = joystate;
@@ -547,7 +547,7 @@ static int colorval(int v)
        return ((v & 255)*0x01010101) >> 26;
 }
 
-void C64Display::InitColors(UBYTE *colors)
+void C64Display::InitColors(uint8 *colors)
 {
        int i;
 
@@ -562,7 +562,7 @@ void C64Display::InitColors(UBYTE *color
  *  Show a requester (error message)
  */
 
-long int ShowRequester(char *a,char *b,char *)
+long int ShowRequester(const char *a, const char *b, const char *)
 {
        printf("%s: %s\n", a, b);
        return 1;