diff options
author | 2013-03-25 20:40:40 +0000 | |
---|---|---|
committer | 2013-03-25 20:40:40 +0000 | |
commit | 48950c12d106c85f315112191a0228d7b83b9510 (patch) | |
tree | 54e43d54484c1bfe9bb06a10ede0ba3e2fa52c08 /gnu/usr.bin/perl/lib/vars.pm | |
parent | avoid null dereference affecting mod_perl, Perl RT bug 116441 (diff) | |
download | wireguard-openbsd-48950c12d106c85f315112191a0228d7b83b9510.tar.xz wireguard-openbsd-48950c12d106c85f315112191a0228d7b83b9510.zip |
merge/resolve conflicts
(some more to do after this one)
Diffstat (limited to 'gnu/usr.bin/perl/lib/vars.pm')
-rw-r--r-- | gnu/usr.bin/perl/lib/vars.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/perl/lib/vars.pm b/gnu/usr.bin/perl/lib/vars.pm index a0151b84030..8ec107c1df3 100644 --- a/gnu/usr.bin/perl/lib/vars.pm +++ b/gnu/usr.bin/perl/lib/vars.pm @@ -2,14 +2,14 @@ package vars; use 5.006; -our $VERSION = '1.01'; +our $VERSION = '1.02'; use warnings::register; use strict qw(vars subs); sub import { my $callpack = caller; - my ($pack, @imports) = @_; + my (undef, @imports) = @_; my ($sym, $ch); foreach (@imports) { if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) { |