diff options
| author | steve <steve@FreeBSD.org> | 1996-10-06 02:35:38 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1996-10-06 02:35:38 +0000 |
| commit | 49662693d9f1e004b037bebf6cc4663e64ae7baa (patch) | |
| tree | ab5bd5270becce85fa203b4b54d26c39fa7c14bc /usr.bin/make/lst.lib | |
| parent | 7dcbb4192b730b0ebfec18a71b61cd487c61320a (diff) | |
| download | FreeBSD-src-49662693d9f1e004b037bebf6cc4663e64ae7baa.zip FreeBSD-src-49662693d9f1e004b037bebf6cc4663e64ae7baa.tar.gz | |
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
Diffstat (limited to 'usr.bin/make/lst.lib')
| -rw-r--r-- | usr.bin/make/lst.lib/lstForEachFrom.c | 3 | ||||
| -rw-r--r-- | usr.bin/make/lst.lib/lstInt.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c index 6ae43ef..58bcb47 100644 --- a/usr.bin/make/lst.lib/lstForEachFrom.c +++ b/usr.bin/make/lst.lib/lstForEachFrom.c @@ -66,7 +66,7 @@ void Lst_ForEachFrom (l, ln, proc, d) Lst l; LstNode ln; - register int (*proc)(); + register int (*proc) __P((ClientData, ClientData)); register ClientData d; { register ListNode tln = (ListNode)ln; @@ -109,3 +109,4 @@ Lst_ForEachFrom (l, ln, proc, d) } while (!result && !LstIsEmpty(list) && !done); } + diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h index 0296558..d83ac83 100644 --- a/usr.bin/make/lst.lib/lstInt.h +++ b/usr.bin/make/lst.lib/lstInt.h @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)lstInt.h 8.1 (Berkeley) 6/6/93 + * from: @(#)lstInt.h 8.1 (Berkeley) 6/6/93 */ /*- @@ -43,6 +43,7 @@ #ifndef _LSTINT_H_ #define _LSTINT_H_ +#include "make.h" #include "lst.h" typedef struct ListNode { @@ -87,7 +88,7 @@ typedef struct { * PAlloc (var, ptype) -- * Allocate a pointer-typedef structure 'ptype' into the variable 'var' */ -#define PAlloc(var,ptype) var = (ptype) malloc (sizeof (*var)) +#define PAlloc(var,ptype) var = (ptype) emalloc (sizeof (*var)) /* * LstValid (l) -- |
