diff options
author | 2019-02-13 21:15:00 +0000 | |
---|---|---|
committer | 2019-02-13 21:15:00 +0000 | |
commit | 9f11ffb7133c203312a01e4b986886bc88c7d74b (patch) | |
tree | 6618511204c614b20256e4ef9dea39a7b311d638 /gnu/usr.bin/perl/lib/Time | |
parent | Import perl-5.28.1 (diff) | |
download | wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.tar.xz wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.zip |
Fix merge issues, remove excess files - match perl-5.28.1 dist
looking good sthen@, Great! bluhm@
Diffstat (limited to 'gnu/usr.bin/perl/lib/Time')
-rw-r--r-- | gnu/usr.bin/perl/lib/Time/gmtime.pm | 10 | ||||
-rw-r--r-- | gnu/usr.bin/perl/lib/Time/localtime.pm | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gnu/usr.bin/perl/lib/Time/gmtime.pm b/gnu/usr.bin/perl/lib/Time/gmtime.pm index eb5b371a004..99f470be51f 100644 --- a/gnu/usr.bin/perl/lib/Time/gmtime.pm +++ b/gnu/usr.bin/perl/lib/Time/gmtime.pm @@ -4,7 +4,12 @@ use 5.006_001; use Time::tm; -our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION); +our (@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION); +our ( $tm_sec, $tm_min, $tm_hour, $tm_mday, + $tm_mon, $tm_year, $tm_wday, $tm_yday, + $tm_isdst, +); + BEGIN { use Exporter (); @ISA = qw(Exporter Time::tm); @@ -15,9 +20,8 @@ BEGIN { $tm_isdst ); %EXPORT_TAGS = ( FIELDS => [ @EXPORT_OK, @EXPORT ] ); - $VERSION = 1.03; + $VERSION = 1.04; } -use vars @EXPORT_OK; sub populate (@) { return unless @_; diff --git a/gnu/usr.bin/perl/lib/Time/localtime.pm b/gnu/usr.bin/perl/lib/Time/localtime.pm index c3d9fb36085..f2ef0840383 100644 --- a/gnu/usr.bin/perl/lib/Time/localtime.pm +++ b/gnu/usr.bin/perl/lib/Time/localtime.pm @@ -4,7 +4,13 @@ use 5.006_001; use Time::tm; -our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION); +our (@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION); +our ( + $tm_sec, $tm_min, $tm_hour, $tm_mday, + $tm_mon, $tm_year, $tm_wday, $tm_yday, + $tm_isdst +); + BEGIN { use Exporter (); @ISA = qw(Exporter Time::tm); @@ -15,9 +21,8 @@ BEGIN { $tm_isdst ); %EXPORT_TAGS = ( FIELDS => [ @EXPORT_OK, @EXPORT ] ); - $VERSION = 1.02; + $VERSION = 1.03; } -use vars @EXPORT_OK; sub populate (@) { return unless @_; |