--- ray/src/rt/vga.c	1993/06/04 14:49:08	2.6
+++ ray/src/rt/vga.c	1997/11/11 20:03:01	2.7
@@ -8,10 +8,8 @@ static char SCCSid[] = "$SunId$ LBL";
  *  vga.c - driver for VGA graphics adaptor under MS-DOS
  */
 
-#include  <stdio.h>
+#include  "standard.h"
 
-#include  <math.h>
-
 #include  <graph.h>
 
 #include  "driver.h"
@@ -52,8 +50,8 @@ char  *name, *id;
 			break;
 	if (*mp == -1) {
 		_setvideomode(_DEFAULTMODE);
-		stderr_v(name);
-		stderr_v(": card not present or insufficient VGA memory\n");
+		eputs(name);
+		eputs(": card not present or insufficient VGA memory\n");
 		return(NULL);
 	}
 	_getvideoconfig(&config);
@@ -78,10 +76,13 @@ char  *name, *id;
 	_remappalette(1, _BRIGHTWHITE);
 	_settextcolor(1);
 	ms_gcinit(&vga_driver);
-	errvec = vga_errout;
-	cmdvec = vga_comout;
-	if (wrnvec != NULL)
-		wrnvec = vga_comout;
+	erract[USER].pf =
+	erract[SYSTEM].pf =
+	erract[INTERNAL].pf =
+	erract[CONSISTENCY].pf = vga_errout;
+	erract[COMMAND].pf = vga_comout;
+	if (erract[WARNING].pf != NULL)
+		erract[WARNING].pf = vga_comout;
 	return(&vga_driver);
 }
 
@@ -91,12 +92,15 @@ vga_close()					/* close VGA */
 {
 	ms_gcdone(&vga_driver);
 	_setvideomode(_DEFAULTMODE);
-	errvec = stderr_v;			/* reset error vectors */
-	cmdvec = NULL;
-	if (wrnvec != NULL)
-		wrnvec = stderr_v;
+	erract[USER].pf = 			/* reset error vector */
+	erract[SYSTEM].pf =
+	erract[INTERNAL].pf =
+	erract[CONSISTENCY].pf = eputs;
+	erract[COMMAND].pf = NULL;
+	if (erract[WARNING].pf != NULL)
+		erract[WARNING].pf = wputs;
 	if (fatalerr[0])
-		stderr_v(fatalerr);		/* repeat error message */
+		eputs(fatalerr);		/* repeat error message */
 }