merge, mkcatdefs: add missing includes, clean up trailing whitespace

cde/programs/localized/util/merge.c

@@ -95,6 +95,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+#include <unistd.h>
 #include <nl_types.h>
 
 nl_catd catfile[2] = {NULL, NULL};	/* [0] for primary, [1] for default */

cde/programs/localized/util/mkcatdefs.c

@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
+#include <unistd.h>
 #include <ctype.h>
 #include <ctype.h>
 
@@ -317,7 +318,7 @@ mkcatdefs(char *fname)
 
 	sscanf (cp+3+len, "%s", setname);
 	if (inclfile)
-	  fprintf (outfp, "\n/* definitions for set %s */\n", setname, "");
+	  fprintf (outfp, "\n/* definitions for set %s */\n", setname);
 	if (isdigit(setname[0])) {
 	  cpt = setname;
 	  do  {