--- ray/src/rt/source.h	2003/06/07 00:54:58	2.7
+++ ray/src/rt/source.h	2003/06/30 14:59:13	2.10
@@ -1,4 +1,4 @@
-/* RCSid $Id: source.h,v 2.7 2003/06/07 00:54:58 schorsch Exp $ */
+/* RCSid $Id: source.h,v 2.10 2003/06/30 14:59:13 schorsch Exp $ */
 /*
  *  source.h - header file for ray tracing sources.
  *
@@ -10,9 +10,8 @@
 extern "C" {
 #endif
 
+#include <string.h>
 
-#include "copyright.h"
-
 #define  AIMREQT	100		/* required aim success/failure */
 
 #define  SDISTANT	01		/* source distant flag */
@@ -47,7 +46,8 @@ typedef struct {
 			int  sn;		/* next source to aim for */
 		}  sv;			/* virtual source */
 	} sa;			/* source aiming information */
-	long  ntests, nhits;	/* shadow tests and hits */
+	unsigned long
+		ntests, nhits;	/* shadow tests and hits */
 	OBJREC  *so;		/* source destination object */
 }  SRCREC;		/* light source */
 
@@ -70,7 +70,7 @@ typedef struct {
 
 #define initsrcindex(s)	((s)->sn = (s)->sp = -1, (s)->np = 0)
 
-#define clrpart(pt)	bzero((char *)(pt), MAXSPART/2)
+#define clrpart(pt)	memset((char *)(pt), '\0', MAXSPART/2)
 #define setpart(pt,i,v)	((pt)[(i)>>2] |= (v)<<(((i)&3)<<1))
 #define spart(pt,pi)	((pt)[(pi)>>2] >> (((pi)&3)<<1) & 3)