--- ray/src/hd/sm_sets.c	1999/06/10 15:22:24	3.5
+++ ray/src/hd/sm_sets.c	2003/04/23 00:52:34	3.7
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: sm_sets.c,v 3.7 2003/04/23 00:52:34 greg Exp $";
 #endif
-
 /*
  * Quadtree-specific set operations.
  */
@@ -37,7 +34,7 @@ OBJECT  *oset;
     osi = qtfreesets;
     qtfreesets = (int)qtsettab[osi];
   } else if ((osi = qtnumsets++) % QTSETIBLK == 0) {
-    qtsettab = (OBJECT **)realloc((char *)qtsettab,
+    qtsettab = (OBJECT **)realloc((void *)qtsettab,
 				  (unsigned)(osi+QTSETIBLK)*sizeof(OBJECT *));
     if (qtsettab == NULL)
       goto memerr;
@@ -70,14 +67,14 @@ OBJECT  id;
 	lf = QT_SET_INDEX(qt);
 #endif
 	if (qtsettab[lf][0] <= 1) {		/* blow leaf away */
-		free((char *)qtsettab[lf]);
+		free((void *)qtsettab[lf]);
 		qtsettab[lf] = (OBJECT *)qtfreesets;
 		qtfreesets = lf;
 		return(EMPTY);
 	}
 	deletelem(qtsettab[lf], id);
 	if (QTONTHRESH(qtsettab[lf][0]))
-		qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
+		qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
 				QTNODESIZ(qtsettab[lf][0])*sizeof(OBJECT));
 	return(qt);
 }
@@ -108,7 +105,7 @@ OBJECT  id;
 	lf = QT_SET_INDEX(qt);
 #endif
 	if (QTONTHRESH(qtsettab[lf][0])) {
-		qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
+		qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
 				QTNODESIZ(qtsettab[lf][0]+1)*sizeof(OBJECT));
 		if (qtsettab[lf] == NULL)
 			error(SYSTEM, "out of memory in qtaddelem");
@@ -142,7 +139,7 @@ QUADTREE  qt;
 	osi = QT_SET_INDEX(qt);
 	if (osi >= qtnumsets)
 		return;
-	free((char *)qtsettab[osi]);
+	free((void *)qtsettab[osi]);
 	qtsettab[osi] = (OBJECT *)qtfreesets;
 	qtfreesets = osi;
 }
@@ -159,8 +156,8 @@ qtfreeleaves()			/* free ALL sets and leaf nodes */
 	}
 	for (i = qtnumsets; i--; )
 		if (qtsettab[i] != NULL)
-			free((char *)qtsettab[i]);
-	free((char *)qtsettab);
+			free((void *)qtsettab[i]);
+	free((void *)qtsettab);
 	qtsettab = NULL;
 	qtnumsets = 0;
 }