diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-01-15 10:44:48 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-01-15 10:51:34 +0100 |
| commit | 2384b50e7d567cc26553443b6790b3062d405463 (patch) | |
| tree | a5ed604cf90256b1fa8e075b98bb0c668d671b55 /conform/conformtest.pl | |
| parent | e6073eebddb6c1c58d23175826515a3522c785da (diff) | |
| parent | 5306d3613a3e71d8ede6529e858e2398223ac3da (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'conform/conformtest.pl')
| -rw-r--r-- | conform/conformtest.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/conform/conformtest.pl b/conform/conformtest.pl index c528127cee..d324d81c53 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -1048,6 +1048,7 @@ while ($#headers >= 0) { open (ALLOW, "$CC -E -D$dialect - < data/$ah-data |"); acontrol: while (<ALLOW>) { + chop; next acontrol if (/^#/); next acontrol if (/^[ ]*$/); @@ -1057,8 +1058,8 @@ while ($#headers >= 0) { push @allow, $1; } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*)?/) { push @allow, 1; - } elsif (/^type *({([^}]*)|([a-zA-Z0-9_]*))/) { - my($type) = "$2$3"; + } elsif (/^(type|tag) *({([^}]*)|([a-zA-Z0-9_]*))/) { + my($type) = "$3$4"; # Remember that this name is allowed. if ($type =~ /^struct *(.*)/) { |