In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2018906832b2c4787a4decced6a41a76c670d14c?hp=e32ff4e1e2b9fb64a8d68add6913fc04e4b3152e>
- Log ----------------------------------------------------------------- commit 2018906832b2c4787a4decced6a41a76c670d14c Author: Father Chrysostomos <[email protected]> Date: Fri Sep 12 21:46:05 2014 -0700 pp_ctl.c: Remove junk from #endif What was I thinking? M pp_ctl.c commit 0ddd4a5b1910c8bfa9b7e55eb0db60a115fe368c Author: Father Chrysostomos <[email protected]> Date: Fri Sep 12 21:45:33 2014 -0700 Mathomise save_re_context at Jarkkoâs suggestion. M mathoms.c M regcomp.c ----------------------------------------------------------------------- Summary of changes: mathoms.c | 7 +++++++ pp_ctl.c | 4 ++-- regcomp.c | 11 ----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/mathoms.c b/mathoms.c index f9b9462..fa60621 100644 --- a/mathoms.c +++ b/mathoms.c @@ -1767,6 +1767,13 @@ Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) return NATIVE_TO_UNI(valid_utf8_to_uvchr(s, retlen)); } +void +Perl_save_re_context(pTHX) +{ + PERL_UNUSED_CONTEXT; +} + + END_EXTERN_C #endif /* NO_MATHOMS */ diff --git a/pp_ctl.c b/pp_ctl.c index 429143f..108643e 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -1616,7 +1616,7 @@ Perl_die_unwind(pTHX_ SV *msv) SV **newsp; #ifdef DEBUGGING COP *oldcop; -#endif DEBUGGING +#endif JMPENV *restartjmpenv; OP *restartop; @@ -1635,7 +1635,7 @@ Perl_die_unwind(pTHX_ SV *msv) namesv = cx->blk_eval.old_namesv; #ifdef DEBUGGING oldcop = cx->blk_oldcop; -#endif DEBUGGING +#endif restartjmpenv = cx->blk_eval.cur_top_env; restartop = cx->blk_eval.retop; diff --git a/regcomp.c b/regcomp.c index a3eccfa..44b3129 100644 --- a/regcomp.c +++ b/regcomp.c @@ -16785,17 +16785,6 @@ S_re_croak2(pTHX_ bool utf8, const char* pat1,const char* pat2,...) Perl_croak(aTHX_ "%"UTF8f, UTF8fARG(utf8, l1-1, buf)); } -/* Get this: We have an empty void function here. But it somehow got into - the API, so there you go. */ - -#ifndef PERL_IN_XSUB_RE -void -Perl_save_re_context(pTHX) -{ - PERL_UNUSED_CONTEXT; -} -#endif - #ifdef DEBUGGING /* Certain characters are output as a sequence with the first being a * backslash. */ -- Perl5 Master Repository
