X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/042f5bed7ff3e5b34ff3166951a7b98bf6bbf105..2b677bfbc0ece2abfb27fa5ff7827ebe2e4609a0:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index ea0c7d32..a4402c56 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -11,6 +11,7 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_popen.h"
 #include <setjmp.h>
 #include <sys/types.h>
 
@@ -302,7 +303,7 @@ static char delim3[] =		/* from forw.c */
     "\n----------------------------------------------------------------------\n\n";
 static char delim4[] = "\n------------------------------\n\n";
 
-static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
+static FILE *(*mhl_action)(char *);
 
 /*
  * prototypes
@@ -521,7 +522,7 @@ mhl (int argc, char **argv)
 	}
 	else
 	    printf ("\n------- End of Forwarded Message%s\n",
-		    vecp > 1 ? "s" : "");
+		    PLURALS(vecp));
     }
 
     fflush(stdout);
@@ -946,7 +947,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 	else {
 	    printf ("\n-------");
 	    if (ofilen == 1)
-		printf (" Forwarded Message%s", ofilec > 1 ? "s" : "");
+		printf (" Forwarded Message%s", PLURALS(ofilec));
 	    else
 		printf (" Message %d", ofilen);
 	    printf ("\n\n");