Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr --- tools/winapi/winapi_test | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8..784b4c4 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -859,8 +859,7 @@ foreach my $test_dir (@test_dirs) {
foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { $output->prefix("$header: "); - $header =~ s%^include/%%; - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; + my $type_name2type = $file2types{$pointer_size}{$header}; foreach my $_type_name (sort(keys(%$type_name2type))) { my $type_name = $_type_name;
@@ -874,10 +873,10 @@ $output->prefix("$winapi_dir/tests.dat: "); foreach my $type_name (sort(keys(%type_names_used))) { my $found = 0; foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; - if (exists($type_name2type{$type_name})) { - $found = 1; - } + if (exists($file2types{$pointer_size}{$header}{$type_name})) { + $found = 1; + last; + } }
if (!$found) {
Signed-off-by: Francois Gouget fgouget@free.fr
Makes sense. In both cases we are iterating over the $file2types{$pointer_size} keys so we should reuse them as is to access the data.