Merge in NetBSD's changes to make(1). Changes include:

	- Add the .PHONY, .PARALLEL, and .WAIT directives
	- Added the -B and -m commandline flags
	- misc. man page cleanups
	- numerous job-related enhancements
	- removed unused header file (bit.h)
	- add util.c for functions not found in other envs.
	- and a few coordinated whitespace changes

Special thanks to Christos Zoulas <christos@netbsd.org>
for help in the merge.  A 'diff -ur' between Net and
FreeBSD now only contains sccsid-related diffs. :)

Obtained from: NetBSD, christos@netbsd.org, and me

1 files changed, 6 insertions, 4 deletions

diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 4bf802b39b4e..eb6fa5c46234 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -94,6 +94,7 @@ typedef enum {
  * Structures to handle elegantly the different forms of #if's. The
  * last two fields are stored in condInvert and condDefProc, respectively.
  */
+static void CondPushBack __P((Token));
 static int CondGetArg __P((char **, char **, char *, Boolean));
 static Boolean CondDoDefined __P((int, char *));
 static int CondStrMatch __P((ClientData, ClientData));
@@ -110,18 +111,19 @@ static struct If {
     char	*form;	      /* Form of if */
     int		formlen;      /* Length of form */
     Boolean	doNot;	      /* TRUE if default function should be negated */
-    Boolean	(*defProc)(); /* Default function to apply */
+    Boolean	(*defProc) __P((int, char *)); /* Default function to apply */
 } ifs[] = {
     { "ifdef",	  5,	  FALSE,  CondDoDefined },
     { "ifndef",	  6,	  TRUE,	  CondDoDefined },
     { "ifmake",	  6,	  FALSE,  CondDoMake },
     { "ifnmake",  7,	  TRUE,	  CondDoMake },
     { "if",	  2,	  FALSE,  CondDoDefined },
-    { (char *)0,  0,	  FALSE,  (Boolean (*)())0 }
+    { NULL,	  0,	  FALSE,  NULL }
 };
 
 static Boolean	  condInvert;	    	/* Invert the default function */
-static Boolean	  (*condDefProc)(); 	/* Default function to apply */
+static Boolean	  (*condDefProc)	/* Default function to apply */
+		    __P((int, char *));
 static char 	  *condExpr;	    	/* The expression to parse */
 static Token	  condPushBack=None;	/* Single push-back token used in
 					 * parsing */
@@ -758,7 +760,7 @@ error:
 		break;
 	    }
 	    default: {
-		Boolean (*evalProc)();
+		Boolean (*evalProc) __P((int, char *));
 		Boolean invert = FALSE;
 		char	*arg;
 		int	arglen;