--- etc/papd/comment.c.orig	Sun Aug 17 09:20:22 1997
+++ etc/papd/comment.c	Mon Nov 15 11:32:55 1999
@@ -7,7 +7,7 @@
 #include <sys/param.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
 
 #include "comment.h"
 
@@ -15,6 +15,7 @@
 
 char	*comcont = "%%+";
 
+void
 compop()
 {
     struct comstate	*cs;
@@ -24,6 +25,7 @@
     free( cs );
 }
 
+int
 compush( comment )
     struct comment	*comment;
 {
@@ -39,8 +41,10 @@
     cs->cs_prev = comstate;
     cs->cs_flags = 0;
     comstate = cs;
+	return(0);
 }
 
+int
 comswitch( comments, handler )
     struct comment	*comments;
     int			(*handler)();
@@ -61,6 +65,7 @@
     return( 0 );
 }
 
+int
 comcmp( start, stop, str, how )
     char	*start, *stop, *str;
     int		how;
@@ -70,7 +75,7 @@
     len = stop - start;
     cc = strlen( str );
     if ( how & C_FULL ) {
-	if ( cc == len & strncmp( str, start, cc ) == 0 ) {
+	if ( (cc == len) & (strncmp( str, start, cc ) == 0) ) {
 	    return( 0 );
 	}
     } else {
@@ -110,7 +115,7 @@
     }
 
     for ( ; pos < stop; pos++ ) {
-	if ( index( delim, *pos )) {
+	if ( strchr( delim, *pos )) {
 	    break;
 	}
     }