In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/a519c2cf8a56d92061e00b715b65a73dd66692c6?hp=364363242d6bbaa0b9f670ffab5325ead26b32ee>
- Log ----------------------------------------------------------------- commit a519c2cf8a56d92061e00b715b65a73dd66692c6 Author: David Golden <[email protected]> Date: Tue Jul 6 00:42:53 2010 -0400 replace spaces with tabs in MANIFEST M MANIFEST commit da8fb5d83273575a3f023278c420d4e97395a124 Author: David Golden <[email protected]> Date: Tue Jul 6 00:33:31 2010 -0400 Don't set strict for 'no 6;' Commit faee19b51573e81abe8811f1256a1d27777d6d04 was incomplete and only stopped features from being enabled under 'no'. This patch merges all 'use N.NN' type logic into a single if clause and then checks version numbers in separate if statements within it. M pp_ctl.c commit 3df237b69e46d82120bcd3d16a325446fbd954fd Author: David Golden <[email protected]> Date: Tue Jul 6 00:10:03 2010 -0400 Ignore generated files from Time-HiRes M cpan/.gitignore ----------------------------------------------------------------------- Summary of changes: MANIFEST | 2 +- cpan/.gitignore | 4 +++- pp_ctl.c | 29 ++++++++++++++--------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/MANIFEST b/MANIFEST index 820fb78..b97e7de 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4084,7 +4084,7 @@ Porting/README.y2038 Perl notes for the 2038 fix Porting/regcharclass.pl Generate regcharclass.h from inline data Porting/release_managers_guide.pod Release Manager's Guide Porting/release_schedule.pod Schedule for future releases -Porting/rt_list_patches A tool to help you apply patches from RT +Porting/rt_list_patches A tool to help you apply patches from RT Porting/sort_perldiag.pl Keep our diagnostics orderly Porting/testall.atom Cumulative profile with Third Degree Porting/thirdclean Cleanup Third Degree reports diff --git a/cpan/.gitignore b/cpan/.gitignore index fca72c5..76b8d95 100644 --- a/cpan/.gitignore +++ b/cpan/.gitignore @@ -6,4 +6,6 @@ pm_to_blib Makefile Makefile.PL ppport.h -Win32API-File/cFile_pc_to_blib \ No newline at end of file +Time-HiRes/*.inc +Time-HiRes/xdefine +Win32API-File/cFile_pc_to_blib diff --git a/pp_ctl.c b/pp_ctl.c index 1525789..912e934 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -3365,21 +3365,20 @@ PP(pp_require) } /* We do this only with "use", not "require" or "no". */ - if (PL_compcv && - !(cUNOP->op_first->op_private & OPpCONST_NOVER) && - /* If we request a version >= 5.9.5, load feature.pm with the - * feature bundle that corresponds to the required version. */ - vcmp(sv, sv_2mortal(upg_version(newSVnv(5.009005), FALSE))) >= 0) { - SV *const importsv = vnormal(sv); - *SvPVX_mutable(importsv) = ':'; - ENTER_with_name("load_feature"); - Perl_load_module(aTHX_ 0, newSVpvs("feature"), NULL, importsv, NULL); - LEAVE_with_name("load_feature"); - } - /* If a version >= 5.11.0 is requested, strictures are on by default! */ - if (PL_compcv && - vcmp(sv, sv_2mortal(upg_version(newSVnv(5.011000), FALSE))) >= 0) { - PL_hints |= (HINT_STRICT_REFS | HINT_STRICT_SUBS | HINT_STRICT_VARS); + if (PL_compcv && !(cUNOP->op_first->op_private & OPpCONST_NOVER)) { + /* If we request a version >= 5.9.5, load feature.pm with the + * feature bundle that corresponds to the required version. */ + if (vcmp(sv, sv_2mortal(upg_version(newSVnv(5.009005), FALSE))) >= 0) { + SV *const importsv = vnormal(sv); + *SvPVX_mutable(importsv) = ':'; + ENTER_with_name("load_feature"); + Perl_load_module(aTHX_ 0, newSVpvs("feature"), NULL, importsv, NULL); + LEAVE_with_name("load_feature"); + } + /* If a version >= 5.11.0 is requested, strictures are on by default! */ + if (vcmp(sv, sv_2mortal(upg_version(newSVnv(5.011000), FALSE))) >= 0) { + PL_hints |= (HINT_STRICT_REFS | HINT_STRICT_SUBS | HINT_STRICT_VARS); + } } RETPUSHYES; -- Perl5 Master Repository
