X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.h;h=d6a1c4c77fd887574cbdd841eb3a02a39bbfe6ff;hb=463ee0b2acbd047c27e8b5393cdd8398881824c5;hp=570633f19db51ecf76df6ecdae44fb82b16aacca;hpb=93a17b20b6d176db3f04f51a63b0a781e5ffd11c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.h b/pp.h
index 570633f..d6a1c4c 100644
--- a/pp.h
+++ b/pp.h
@@ -20,7 +20,7 @@
  **********************************************************/
 
 #define ARGS
-#define ARGSproto
+#define ARGSproto void
 #define dARGS
 #define PP(s) OP* s(ARGS) dARGS
 
@@ -70,16 +70,16 @@
 #define RETURNX(x)	return x, PUTBACK, NORMAL
 
 #define POPs		(*sp--)
-#define POPp		(SvPVnx(POPs))
-#define POPn		(SvNVnx(POPs))
-#define POPi		((int)SvIVnx(POPs))
-#define POPl		((long)SvIVnx(POPs))
+#define POPp		(SvPVx(POPs, na))
+#define POPn		(SvNVx(POPs))
+#define POPi		((int)SvIVx(POPs))
+#define POPl		((long)SvIVx(POPs))
 
 #define TOPs		(*sp)
-#define TOPp		(SvPVn(TOPs))
-#define TOPn		(SvNVn(TOPs))
-#define TOPi		((int)SvIVn(TOPs))
-#define TOPl		((long)SvIVn(TOPs))
+#define TOPp		(SvPV(TOPs, na))
+#define TOPn		(SvNV(TOPs))
+#define TOPi		((int)SvIV(TOPs))
+#define TOPl		((long)SvIV(TOPs))
 
 /* Go to some pains in the rare event that we must extend the stack. */
 #define EXTEND(p,n)	do { if (stack_max - p < (n)) {		  	    \