h2ph corrections to avoid redefined sub warnings

(this is the same change as commit 46f24c54ba4249e3ea156261098960de79140a11, but as applied)

diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 3471300..d48571f 100644 (file)
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -116,10 +116,10 @@ foreach $file (@ARGV) {
                    if ($t ne '') {
                        $new =~ s/(['\\])/\\$1/g;
                        print OUT $t,
-                         "eval 'sub $name $proto\{\n$t    ${args}eval \"$new\";\n$t}';\n";
+                        "eval 'sub $name $proto\{\n$t    ${args}eval \"$new\";\n$t}' unless defined(\&$name);\n";
                    }
                    else {
-                       print OUT "sub $name $proto\{\n    ${args}eval \"$new\";\n}\n";
+                      print OUT "unless defined(\&$name) {\nsub $name $proto\{\n    ${args}eval \"$new\";\n}\n}\n";
                    }
                    %curargs = ();
                }
@@ -129,10 +129,10 @@ foreach $file (@ARGV) {
                    $new = 1 if $new eq '';
                    if ($t ne '') {
                        $new =~ s/(['\\])/\\$1/g;
-                       print OUT $t,"eval 'sub $name () {",$new,";}';\n";
+                      print OUT $t,"eval 'sub $name () {",$new,";}' unless defined(\&$name);\n";
                    }
                    else {
-                       print OUT $t,"sub $name () {",$new,";}\n";
+                      print OUT $t,"unless(defined(\&$name) {\nsub $name () {",$new,";}\n}\n";
                    }
                }
            }