diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | conform/conformtest.pl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 1fe7b34d62..039c5fa245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-04-28 Joseph Myers <joseph@codesourcery.com> + + * conform/conformtest.pl: Fix typo in handling typed-constant from + allow-header. + 2012-04-27 Joseph Myers <joseph@codesourcery.com> * README: Cut down references to pre-2.6 Linux kernels and diff --git a/conform/conformtest.pl b/conform/conformtest.pl index 83650c2454..2962e5552b 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -1095,7 +1095,7 @@ while ($#headers >= 0) { } elsif (/^constant *([a-zA-Z0-9_]*) *([A-Za-z0-9_]*)?/) { push @allow, $1; } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*)?/) { - push @allow, 1; + push @allow, $1; } elsif (/^(type|tag) *({([^}]*)|([a-zA-Z0-9_]*))/) { my($type) = "$3$4"; |