mirror of
https://git.savannah.gnu.org/git/make.git
synced 2025-02-06 22:45:27 +00:00
Formerly read.c.~32~
This commit is contained in:
parent
39f1bf9ce8
commit
92dc493189
1 changed files with 11 additions and 5 deletions
12
read.c
12
read.c
|
@ -794,11 +794,17 @@ conditional_line (line, filename, lineno)
|
||||||
xrealloc (conditionals->ignoring, conditionals->max_ignoring);
|
xrealloc (conditionals->ignoring, conditionals->max_ignoring);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (conditionals->if_cmds > 1 &&
|
/* Search through the stack to see if we're already ignoring. */
|
||||||
conditionals->ignoring[conditionals->if_cmds - 2])
|
for (i = 0; i < conditionals->if_cmds; ++i)
|
||||||
|
if (conditionals->ignoring[i])
|
||||||
|
{
|
||||||
/* We are already ignoring, so just push a level
|
/* We are already ignoring, so just push a level
|
||||||
to match the next "else" or "endif", and keep ignoring. */
|
to match the next "else" or "endif", and keep ignoring.
|
||||||
|
We don't want to expand variables in the condition. */
|
||||||
conditionals->ignoring[conditionals->if_cmds - 1] = 1;
|
conditionals->ignoring[conditionals->if_cmds - 1] = 1;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
else if (cmdname[notdef ? 3 : 2] == 'd')
|
else if (cmdname[notdef ? 3 : 2] == 'd')
|
||||||
{
|
{
|
||||||
/* "Ifdef" or "ifndef". */
|
/* "Ifdef" or "ifndef". */
|
||||||
|
|
Loading…
Reference in a new issue