diff options
| -rw-r--r-- | usr.bin/make/main.c | 1 | ||||
| -rw-r--r-- | usr.bin/make/make.h | 3 | ||||
| -rw-r--r-- | usr.bin/make/nonints.h | 50 | ||||
| -rw-r--r-- | usr.bin/make/parse.c | 1 | ||||
| -rw-r--r-- | usr.bin/make/var.c | 1 |
5 files changed, 3 insertions, 53 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 2035ead..1229b20 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -85,7 +85,6 @@ __FBSDID("$FreeBSD$"); #include "globals.h" #include "job.h" #include "make.h" -#include "nonints.h" #include "parse.h" #include "pathnames.h" #include "str.h" diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index 4ad10bb..9f020bb 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -51,6 +51,7 @@ struct GNode; struct Lst; +struct Buffer; /* * The OP_ constants are used when parsing a dependency line as a way of @@ -139,5 +140,7 @@ int Make_HandleUse(struct GNode *, struct GNode *); void Make_Update(struct GNode *); void Make_DoAllVar(struct GNode *); Boolean Make_Run(struct Lst *); +void Main_ParseArgLine(char *, int); +int Main_ParseWarn(const char *, int); #endif /* make_h_a91074b9 */ diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h deleted file mode 100644 index 064cc1c..0000000 --- a/usr.bin/make/nonints.h +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * Copyright (c) 1988, 1989, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 1989 by Berkeley Softworks - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Adam de Boor. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)nonints.h 8.4 (Berkeley) 4/28/95 - * $FreeBSD$ - */ - -#ifndef nonints_h_33c5dafb -#define nonints_h_33c5dafb - -struct Buffer; - -void Main_ParseArgLine(char *, int); -int Main_ParseWarn(const char *, int); - -#endif /* nonints_h_33c5dafb */ diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 3defe1d..05cd8e3 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -88,7 +88,6 @@ __FBSDID("$FreeBSD$"); #include "hash_tables.h" #include "job.h" #include "make.h" -#include "nonints.h" #include "parse.h" #include "pathnames.h" #include "str.h" diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 0bdb2b8..55e5b79 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -97,7 +97,6 @@ __FBSDID("$FreeBSD$"); #include "GNode.h" #include "job.h" #include "make.h" -#include "nonints.h" #include "parse.h" #include "str.h" #include "targ.h" |
