[src/trunk]: src/usr.bin/make make(1): replay the changes from v1.283

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe78c0d4c5f3
branches:  trunk
changeset: 954531:fe78c0d4c5f3
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Sep 05 19:11:16 2020 +0000

description:
make(1): replay the changes from v1.283

I accidentally reverted them in v1.284.

diffstat:

 usr.bin/make/parse.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r bb711048db89 -r fe78c0d4c5f3 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Sep 05 19:07:25 2020 +0000
+++ b/usr.bin/make/parse.c      Sat Sep 05 19:11:16 2020 +0000
@@ -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 @@
     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 @@
        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;
 }