--- ray/src/hd/rhd_geom.c	1999/01/29 15:33:36	3.8
+++ ray/src/hd/rhd_geom.c	2003/05/13 17:58:33	3.10
@@ -1,9 +1,6 @@
-/* Copyright (c) 1999 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhd_geom.c,v 3.10 2003/05/13 17:58:33 greg Exp $";
 #endif
-
 /*
  * Geometry drawing operations for OpenGL driver.
  */
@@ -84,8 +81,8 @@ gmEndGeom()			/* make next list current */
 			freestr(gmCurrent[i].gfile);
 		}
 	}
-	bcopy((char *)gmNext, (char *)gmCurrent, sizeof(gmNext));
-	bzero((char *)gmNext, sizeof(gmNext));
+	bcopy((void *)gmNext, (void *)gmCurrent, sizeof(gmNext));
+	bzero((void *)gmNext, sizeof(gmNext));
 }
 
 
@@ -199,7 +196,7 @@ gmEndPortal()			/* close portal list and return GL lis
 		}
 	FORALLPORT(curportlist, n)		/* free old file list */
 		freestr(curportlist[n]);
-	bcopy((char *)newportlist, (char *)curportlist, sizeof(newportlist));
-	bzero((char *)newportlist, sizeof(newportlist));
+	bcopy((void *)newportlist, (void *)curportlist, sizeof(newportlist));
+	bzero((void *)newportlist, sizeof(newportlist));
 	return(gmPortals);			/* return GL list id */
 }