--- ray/src/hd/rhdisp.c	2003/04/23 00:52:33	3.44
+++ ray/src/hd/rhdisp.c	2003/06/30 14:59:11	3.47
@@ -1,15 +1,17 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhdisp.c,v 3.44 2003/04/23 00:52:33 greg Exp $";
+static const char	RCSid[] = "$Id: rhdisp.c,v 3.47 2003/06/30 14:59:11 schorsch Exp $";
 #endif
 /*
  * Holodeck display process.
  */
 
+#include <string.h>
+#include <ctype.h>
+
 #include "rholo.h"
 #include "rhdisp.h"
 #include "rhdriver.h"
 #include "selcall.h"
-#include <ctype.h>
 
 #ifndef VIEWHISTLEN
 #define VIEWHISTLEN	4	/* number of remembered views */
@@ -216,7 +218,7 @@ char	*gfn, *pfn;
 	hdlist[hd] = (HOLO *)malloc(sizeof(HOLO));
 	if (hdlist[hd] == NULL)
 		error(SYSTEM, "out of memory in add_holo");
-	bcopy((char *)hdg, (char *)hdlist[hd], sizeof(HDGRID));
+	memcpy((void *)hdlist[hd], (void *)hdg, sizeof(HDGRID));
 	hdcompgrid(hdlist[hd]);
 	hdgfn[hd] = savestr(gfn);
 	hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL;
@@ -275,7 +277,7 @@ register VIEW	*v;
 	static unsigned	nhist;
 	VIEW	*dv;
 	int	i, res[2];
-	int2	*slist;
+	int16	*slist;
 	char	*err;
 				/* restore previous view? */
 	if (v == NULL) {