--- ray/src/hd/rholo.c	2003/06/20 00:25:49	3.57
+++ ray/src/hd/rholo.c	2003/06/30 14:59:12	3.59
@@ -1,15 +1,17 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rholo.c,v 3.57 2003/06/20 00:25:49 greg Exp $";
+static const char	RCSid[] = "$Id: rholo.c,v 3.59 2003/06/30 14:59:12 schorsch Exp $";
 #endif
 /*
  * Radiance holodeck generation controller
  */
 
-#include "rholo.h"
-#include "random.h"
 #include <signal.h>
 #include <sys/stat.h>
+#include <string.h>
 
+#include "rholo.h"
+#include "random.h"
+
 #ifndef FRAGWARN
 #define FRAGWARN	20		/* fragmentation for warning (%) */
 #endif
@@ -215,7 +217,7 @@ initrholo()			/* get our holodeck running */
 		init_global();
 						/* record disk space limit */
 	if (!vdef(DISKSPACE))
-		maxdisk = (1L<<(sizeof(off_t)*8-2)) - 1024;
+		maxdisk = ((off_t)1<<(sizeof(off_t)*8-2)) - 1024;
 	else
 		maxdisk = 1024.*1024.*vflt(DISKSPACE);
 						/* set up memory cache */
@@ -531,8 +533,8 @@ PACKET	*pl;
 	while (pl != NULL) {
 		p = pl; pl = p->next; p->next = NULL;
 		if (p->nr > 0) {		/* add to holodeck */
-			bcopy((void *)p->ra,
-				(void *)hdnewrays(hdlist[p->hd],p->bi,p->nr),
+			memcpy( (void *)hdnewrays(hdlist[p->hd],p->bi,p->nr),
+				(void *)p->ra,
 				p->nr*sizeof(RAYVAL));
 			if (outdev != NULL)	/* display it */
 				disp_packet((PACKHEAD *)p);