--- ray/src/px/psign.c	2003/06/08 12:03:10	2.20
+++ ray/src/px/psign.c	2003/10/22 02:06:35	2.24
@@ -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.24 2003/10/22 02:06:35 greg Exp $";
 #endif
 /*
  *  psign.c - produce picture from text.
@@ -7,8 +7,12 @@ static const char	RCSid[] = "$Id: psign.c,v 2.20 2003/
  *	7/1/87
  */
 
-#include  "standard.h"
+#include  "copyright.h"
+
+#include  <string.h>
+
 #include  "platform.h"
+#include  "standard.h"
 #include  "color.h"
 #include  "font.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);
 }
 
 
@@ -219,7 +229,7 @@ FILE  *fp;
 		len = strlen(buf);
 		curl->s = (char *)malloc(len);
 		curl->sp = (short *)malloc(sizeof(short)*len--);
-		if (curl->s == NULL | curl->sp == NULL)
+		if ((curl->s == NULL) | (curl->sp == NULL))
 			goto memerr;
 		if (len > maxline)
 			maxline = len;