diff options
| author | rillig <rillig@NetBSD.org> | 2020-09-05 19:11:16 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-09-05 19:11:16 +0000 |
| commit | fb3047c2efe4af224864d4a31099d012b93e1a36 (patch) | |
| tree | f1f09e097312c0b592454ba96d357dd1fa38c940 /usr.bin/make/parse.c | |
| parent | bc2eb3966aeeacca973c9950d51ae91d915f4516 (diff) | |
make(1): replay the changes from v1.283
I accidentally reverted them in v1.284.
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 88a309c5001..19d02c48aaf 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.284 2020/09/05 19:07:25 rillig Exp $ */ +/* $NetBSD: parse.c,v 1.285 2020/09/05 19:11:16 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.284 2020/09/05 19:07:25 rillig Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.285 2020/09/05 19:11:16 rillig Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.284 2020/09/05 19:07:25 rillig Exp $"); +__RCSID("$NetBSD: parse.c,v 1.285 2020/09/05 19:11:16 rillig Exp $"); #endif #endif /* not lint */ #endif @@ -2312,8 +2312,7 @@ GetActuallyIncludingFile(void) return NULL; } -/* Set .PARSEDIR/.PARSEFILE to the given filename, as well as - * .INCLUDEDFROMDIR/.INCLUDEDFROMFILE. */ +/* Set .PARSEDIR, .PARSEFILE, .INCLUDEDFROMDIR and .INCLUDEDFROMFILE. */ static void ParseSetParseFile(const char *filename) { @@ -2605,7 +2604,6 @@ ParseEOF(void) fprintf(debug_file, "ParseEOF: returning to file %s, line %d\n", curFile->fname, curFile->lineno); - /* Restore the PARSEDIR/PARSEFILE variables */ ParseSetParseFile(curFile->fname); return CONTINUE; } |
