Follow-up for r3807: make the hunk headers match again.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3808 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2011-08-16 08:32:23 +00:00
parent 803bae6fb8
commit 8f48d8d7e9

View File

@@ -265,9 +265,6 @@ function handle_if(evaluated)
|| ($0 ~ "SCSI_EXEC_REQ_FIFO_DEFINED" && SCSI_EXEC_REQ_FIFO_DEFINED!="") \
|| ($0 ~ "SCST_IO_CONTEXT" && SCST_IO_CONTEXT != ""))
{
#print $0 " -> " evaluated
input_line_count = 1
input_line[0] = evaluated
}
else
{
@@ -362,8 +359,15 @@ function process_preprocessor_statement(evaluated, condition) {
|| condition && matching_if !~ "^+#if [01]" \
&& matching_if !~ "^+#elif [01]"))
{
for (i = 0; i < input_line_count; i++)
line[lines++] = input_line[i]
if (evaluated == "+#if undecided" \
|| (evaluated !~ "^+#if" && evaluated !~ "^+#elif"))
{
for (i = 0; i < input_line_count; i++)
line[lines++] = input_line[i]
} else {
line[lines++] = evaluated
lines_less_added += input_line_count - 1
}
}
else
{