--- ray/src/px/psign.c	2003/06/08 12:03:10	2.20
+++ ray/src/px/psign.c	2003/06/30 14:59:12	2.22
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: psign.c,v 2.20 2003/06/08 12:03:10 schorsch Exp $";
+static const char	RCSid[] = "$Id: psign.c,v 2.22 2003/06/30 14:59:12 schorsch Exp $";
 #endif
 /*
  *  psign.c - produce picture from text.
@@ -7,6 +7,10 @@ static const char	RCSid[] = "$Id: psign.c,v 2.20 2003/
  *	7/1/87
  */
 
+#include  "copyright.h"
+
+#include  <string.h>
+
 #include  "standard.h"
 #include  "platform.h"
 #include  "color.h"
@@ -34,6 +38,12 @@ unsigned char  *ourbitmap;		/* our output bitmap */
 int  xsiz, ysiz;			/* bitmap dimensions */
 int  xdim;				/* size of horizontal scan (bytes) */
 
+				/* conflicting def's in param.h */
+#undef	tstbit
+#undef	setbit
+#undef	clrbit
+#undef	tglbit
+
 #define	 bitop(x,y,op)		(ourbitmap[(y)*xdim+((x)>>3)] op (1<<((x)&7)))
 #define	 tstbit(x,y)		bitop(x,y,&)
 #define	 setbit(x,y)		bitop(x,y,|=)
@@ -198,7 +208,7 @@ makemap()			/* create the bit map */
 	ourbitmap = (BYTE *)bmalloc(ysiz*xdim);
 	if (ourbitmap == NULL)
 		error(SYSTEM, "Out of memory in makemap");
-	bzero((char *)ourbitmap, ysiz*xdim);
+	memset((char *)ourbitmap, '\0', ysiz*xdim);
 }