--- ray/src/hd/rhdobj.c	2003/06/26 00:58:10	3.13
+++ ray/src/hd/rhdobj.c	2003/07/21 22:30:18	3.15
@@ -1,10 +1,12 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhdobj.c,v 3.13 2003/06/26 00:58:10 schorsch Exp $";
+static const char	RCSid[] = "$Id: rhdobj.c,v 3.15 2003/07/21 22:30:18 schorsch Exp $";
 #endif
 /*
  * Routines for loading and displaying Radiance objects in rholo with GLX.
  */
 
+#include <string.h>
+
 #include "radogl.h"
 #include "tonemap.h"
 #include "rhdisp.h"
@@ -338,7 +340,7 @@ ssph_compute()			/* compute source set from sphere sam
 	d = 1.0/ncells;
 	scalecolor(dlightsets->lamb, d);
 done:					/* clear sphere sample array */
-	bzero((void *)ssamp, sizeof(ssamp));
+	memset((void *)ssamp, '\0', sizeof(ssamp));
 	return(ncells);
 }
 
@@ -371,7 +373,7 @@ int	force;
 	if (!force)
 		return(0);
 					/* need to compute new light set */
-	copystruct(&cvw, &stdview);
+	cvw = stdview;
 	cvw.type = VT_PER;
 	VCOPY(cvw.vp, ocent);
 	cvw.vup[0] = 1.; cvw.vup[1] = cvw.vup[2] = 0.;
@@ -731,13 +733,13 @@ dobj_unmove()				/* undo last transform change */
 		return(0);
 	}
 					/* hold last transform */
-	bcopy((void *)lastxfav, (void *)txfav,
+	memcpy((void *)txfav, (void *)lastxfav, 
 			(txfac=lastxfac)*sizeof(char *));
 					/* save this transform */
-	bcopy((void *)curobj->xfav, (void *)lastxfav,
+	memcpy((void *)lastxfav, (void *)curobj->xfav, 
 			(lastxfac=curobj->xfac)*sizeof(char *));
 					/* copy back last transform */
-	bcopy((void *)txfav, (void *)curobj->xfav,
+	memcpy((void *)curobj->xfav, (void *)txfav, 
 			(curobj->xfac=txfac)*sizeof(char *));
 					/* set matrices */
 	fullxf(&curobj->xfb, curobj->xfac, curobj->xfav);
@@ -772,7 +774,7 @@ char	*oldnm, *nam;
 	opdup = (DOBJECT *)malloc(sizeof(DOBJECT));
 	if (opdup == NULL)
 		error(SYSTEM, "out of memory in dobj_dup");
-	copystruct(opdup, op);
+	*opdup = *op;
 					/* rename */
 	strcpy(opdup->name, nam);
 					/* get our own copy of transform */