--- ray/src/util/glareval.c	2003/06/26 00:58:11	2.7
+++ ray/src/util/glareval.c	2003/06/30 14:59:13	2.9
@@ -1,10 +1,14 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: glareval.c,v 2.7 2003/06/26 00:58:11 schorsch Exp $";
+static const char	RCSid[] = "$Id: glareval.c,v 2.9 2003/06/30 14:59:13 schorsch Exp $";
 #endif
 /*
  * Compute pixels for glare calculation
  */
 
+#include "copyright.h"
+
+#include <string.h>
+
 #include "rtprocess.h" /* Windows: must come first because of conflicts */
 #include "glare.h"
 
@@ -262,7 +266,7 @@ int	np;
 		fprintf(stderr, "%s: sending %d samples to rtrace...\n",
 				progname, np);
 #endif
-	bzero(pb+6*np, 6*sizeof(float));
+	memset(pb+6*np, '\0', 6*sizeof(float));
 	if (process(&rt_pd, (char *)pb, (char *)pb, 3*sizeof(float)*(np+1),
 			6*sizeof(float)*(np+1)) < 3*sizeof(float)*(np+1)) {
 		fprintf(stderr, "%s: rtrace communication error\n",
@@ -411,8 +415,8 @@ initscans()				/* initialize scanline buffers */
 		hashtab[i] = NULL;
 					/* allocate scanline buffers */
 	scansize = sizeof(SCAN) + pxsiz*sizeof(COLR);
-#ifdef ALIGN
-	scansize = scansize+(sizeof(ALIGN)-1) & ~(sizeof(ALIGN)-1);
+#ifdef ALIGNT
+	scansize = scansize+(sizeof(ALIGNT)-1) & ~(sizeof(ALIGNT)-1);
 #endif
 	i = MAXSBUF / scansize;		/* compute number to allocate */
 	if (i > HSIZE)