Module Name: src Committed By: sjg Date: Fri Feb 19 06:19:06 UTC 2016
Modified Files: src/usr.bin/make: parse.c Log Message: Initialize curFile->depending in Parse_SetInput. To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 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.211 src/usr.bin/make/parse.c:1.212 --- src/usr.bin/make/parse.c:1.211 Thu Feb 18 18:29:14 2016 +++ src/usr.bin/make/parse.c Fri Feb 19 06:19:06 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.211 2016/02/18 18:29:14 christos Exp $ */ +/* $NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.211 2016/02/18 18:29:14 christos Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg 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.211 2016/02/18 18:29:14 christos Exp $"); +__RCSID("$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -2241,7 +2241,6 @@ Parse_include_file(char *file, Boolean i /* Start reading from this file next */ Parse_SetInput(fullname, 0, -1, loadedfile_nextbuf, lf); curFile->lf = lf; - curFile->depending = doing_depend; /* restore this on EOF */ if (depinc) doing_depend = depinc; /* only turn it on */ } @@ -2459,6 +2458,7 @@ Parse_SetInput(const char *name, int lin curFile->nextbuf = nextbuf; curFile->nextbuf_arg = arg; curFile->lf = NULL; + curFile->depending = doing_depend; /* restore this on EOF */ assert(nextbuf != NULL);