Module Name: src
Committed By: rillig
Date: Sat Sep 5 19:11:16 UTC 2020
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make(1): replay the changes from v1.283
I accidentally reverted them in v1.284.
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.284 src/usr.bin/make/parse.c:1.285
--- src/usr.bin/make/parse.c:1.284 Sat Sep 5 19:07:25 2020
+++ src/usr.bin/make/parse.c Sat Sep 5 19:11:16 2020
@@ -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;
}
