From fdcd2e7d3a89072503f3bc1bd4787ec1529a77c5 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Thu, 15 Mar 2001 10:22:50 +0000 Subject: [PATCH] Revert previous change -- apparently it's not quite right. It broke src/sys/modules/if_ef and possibly other things. I tested the build with a make based on rev. 1.26, and it worked fine. Since I'm not particularly inclined to figure out what's going on with this, it's probably prudent just to back it out for now. Found by: jkh Suggested by: jhay --- usr.bin/make/parse.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 2f1c3369a7f..7dc9e61073e 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -2057,24 +2057,18 @@ ParseSkipLine(skip) while (((c = ParseReadc()) != '\n' || lastc == '\\') && c != EOF) { - if (c == '#' && lastc != '\\') { - while ((c = ParseReadc()) != '\n' && c != EOF); + if (c == '\n') { + Buf_ReplaceLastByte(buf, (Byte)' '); + lineno++; - break; - } else { - if (c == '\n') { - Buf_ReplaceLastByte(buf, (Byte)' '); - lineno++; + while ((c = ParseReadc()) == ' ' || c == '\t'); - while ((c = ParseReadc()) == ' ' || c == '\t'); - - if (c == EOF) - break; - } - - Buf_AddByte(buf, (Byte)c); - lastc = c; + if (c == EOF) + break; } + + Buf_AddByte(buf, (Byte)c); + lastc = c; } if (c == EOF) {