--- libggi-2.1.0/default/fbdev/ati/mach64/visual.c.gcc4	2004-09-13 12:19:19.000000000 -0400

+++ libggi-2.1.0/default/fbdev/ati/mach64/visual.c	2005-08-17 16:39:51.000000000 -0400

@@ -281,7 +281,7 @@ static int do_cleanup(ggi_visual *vis)

 	}*/

 	free(priv);

-	ATI_MACH64_PRIV(vis) = NULL;

+	FBDEV_PRIV(vis)->accelpriv = NULL;

 	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);

@@ -313,7 +313,7 @@ static int GGIopen(ggi_visual *vis, stru

 	if (priv == NULL) {

 		return GGI_ENOMEM;

 	}

-	ATI_MACH64_PRIV(vis) = priv;

+	FBDEV_PRIV(vis)->accelpriv = priv;

 	fbdevpriv->mmioaddr = mmap(NULL, fbdevpriv->orig_fix.mmio_len,

--- libggi-2.1.0/default/fbdev/mga/2164w/visual.c.gcc4	2004-09-13 12:19:59.000000000 -0400

+++ libggi-2.1.0/default/fbdev/mga/2164w/visual.c	2005-08-17 16:38:22.000000000 -0400

@@ -111,7 +111,7 @@ static int do_cleanup(ggi_visual *vis)

 	}

 	free(priv);

-	M2164W_PRIV(vis) = NULL;

+	FBDEV_PRIV(vis)->accelpriv = NULL;

 	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);

@@ -253,7 +253,7 @@ static int GGIopen(ggi_visual *vis, stru

 		vis->opdraw->crossblit = GGI_m2164w_crossblit;

 	}

-	M2164W_PRIV(vis) = priv;

+	FBDEV_PRIV(vis)->accelpriv = priv;

 	/* Register cleanup handler */

 	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);

--- libggi-2.1.0/default/fbdev/mga/g400/visual.c.gcc4	2004-09-13 12:20:44.000000000 -0400

+++ libggi-2.1.0/default/fbdev/mga/g400/visual.c	2005-08-17 16:37:39.000000000 -0400

@@ -117,7 +117,7 @@ static int do_cleanup(ggi_visual *vis)

 	}

 	free(priv);

-	MGA_G400_PRIV(vis) = NULL;

+	FBDEV_PRIV(vis)->accelpriv = NULL;

 	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);

@@ -259,7 +259,7 @@ static int GGIopen(ggi_visual *vis, stru

 	  /* vis->opdraw->crossblit = GGI_mga_g400_crossblit; */

 	}

-	MGA_G400_PRIV(vis) = priv;

+	FBDEV_PRIV(vis)->accelpriv = priv;

 	/* Register cleanup handler */

 	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);

--- libggi-2.1.0/display/vcsa/visual.c.gcc4	2004-11-13 19:55:49.000000000 -0500

+++ libggi-2.1.0/display/vcsa/visual.c	2005-08-17 16:28:50.000000000 -0400

@@ -124,7 +124,7 @@ static int GGIopen(ggi_visual *vis, stru

 		}

 	}

- 	priv = VCSA_PRIV(vis) = malloc(sizeof(ggi_vcsa_priv));

+ 	priv = LIBGGI_PRIVATE(vis) = malloc(sizeof(ggi_vcsa_priv));

 	if (priv == NULL) return GGI_ENOMEM;

 	LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));