Put back the cygwin32 Configure fix of 3582 undone by 3597.

[p5sagit/p5-mst-13.2.git] / pp.h

diff --git a/pp.h b/pp.h
index e9bb113..ca8dc35 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -1,6 +1,6 @@
 /*    pp.h
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-1999, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -15,7 +15,7 @@
 #define dARGS
 #endif /* USE_THREADS */
 
-#define PP(s) OP * s(ARGSproto)
+#define PP(s) OP * Perl_##s(pTHX)
 
 #define SP sp
 #define MARK mark
@@ -50,7 +50,7 @@
 #define dTARG SV *targ
 
 #define NORMAL PL_op->op_next
-#define DIE return die
+#define DIE return Perl_die
 
 #define PUTBACK                PL_stack_sp = sp
 #define RETURN         return PUTBACK, NORMAL
@@ -155,18 +155,18 @@
 
 #define SWITCHSTACK(f,t) \
     STMT_START {                                                       \
-       AvFILLp(f) = sp - PL_stack_base;                                        \
+       AvFILLp(f) = sp - PL_stack_base;                                \
        PL_stack_base = AvARRAY(t);                                     \
-       PL_stack_max = PL_stack_base + AvMAX(t);                                \
+       PL_stack_max = PL_stack_base + AvMAX(t);                        \
        sp = PL_stack_sp = PL_stack_base + AvFILLp(t);                  \
-       PL_curstack = t;                                                        \
+       PL_curstack = t;                                                \
     } STMT_END
 
 #define EXTEND_MORTAL(n) \
-       STMT_START { \
-           if (PL_tmps_ix + (n) >= PL_tmps_max) \
-               Renew(PL_tmps_stack, PL_tmps_max = PL_tmps_ix + (n) + 1, SV*); \
-       } STMT_END
+    STMT_START {                                                       \
+       if (PL_tmps_ix + (n) >= PL_tmps_max)                            \
+           tmps_grow(n);                                               \
+    } STMT_END
 
 #define AMGf_noright   1
 #define AMGf_noleft    2
@@ -218,7 +218,7 @@
 
 #define setAGAIN(ref) sv = arg = ref;                                  \
   if (!SvROK(ref))                                                     \
-      croak("Overloaded dereference did not return a reference");      \
+      Perl_croak(aTHX_ "Overloaded dereference did not return a reference");   \
   goto am_again;
 
 #define tryAMAGICunDEREF(meth) tryAMAGICunW(meth,setAGAIN,0,(void)0)