X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=fa117d97ba7de9090a12afb407df657f15e239ca;hb=2e108d5ecae04d8de77b31a357e97990030b8557;hp=95a22ed74520b2f521fc871b075b60b7ba4489e5;hpb=0a7ed27cbdbb90c176fc6be11c48e70776c8df84;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/Upper.xs b/Upper.xs
index 95a22ed..fa117d9 100644
--- a/Upper.xs
+++ b/Upper.xs
@@ -277,7 +277,7 @@ typedef struct {
 
 STATIC void su_call(pTHX_ void *ud_) {
  su_ud_reap *ud = (su_ud_reap *) ud_;
-#if SU_HAS_PERL(5, 10, 0)
+#if SU_HAS_PERL(5, 9, 5)
  PERL_CONTEXT saved_cx;
  I32 dieing = PL_op->op_type == OP_DIE;
  I32 cxix;
@@ -293,10 +293,10 @@ STATIC void su_call(pTHX_ void *ud_) {
  PUSHMARK(SP);
  PUTBACK;
 
- /* If cxstack_ix isn't incremented there, the eval context will be overwritten
-  * when the new sub scope will be created in call_sv. */
+ /* If the recently popped context isn't saved there, it will be overwritten by
+  * the sub scope from call_sv, although it's still needed in our caller. */
 
-#if SU_HAS_PERL(5, 10, 0)
+#if SU_HAS_PERL(5, 9, 5)
  if (dieing) {
   if (cxstack_ix < cxstack_max)
    cxix = cxstack_ix + 1;
@@ -308,7 +308,7 @@ STATIC void su_call(pTHX_ void *ud_) {
 
  call_sv(ud->cb, G_VOID);
 
-#if SU_HAS_PERL(5, 10, 0)
+#if SU_HAS_PERL(5, 9, 5)
  if (dieing)
   cxstack[cxix] = saved_cx;
 #endif