Integrate from ansi branch to mainline.

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

diff --git a/pp.h b/pp.h
index ea1fd39..1914fcc 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -1,16 +1,24 @@
 /*    pp.h
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, 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.
  *
  */
 
+#ifdef USE_THREADS
+#define ARGS thr
+#define dARGS struct perl_thread *thr;
+#else
 #define ARGS
-#define ARGSproto void
 #define dARGS
+#endif /* USE_THREADS */
+#ifdef CAN_PROTOTYPE
+#define PP(s) OP * s(ARGSproto)
+#else /* CAN_PROTOTYPE */
 #define PP(s) OP* s(ARGS) dARGS
+#endif /* CAN_PROTOTYPE */
 
 #define SP sp
 #define MARK mark
@@ -23,7 +31,8 @@
 #define TOPMARK                (*markstack_ptr)
 #define POPMARK                (*markstack_ptr--)
 
-#define dSP            register SV **sp = stack_sp
+#define djSP           register SV **sp = stack_sp
+#define dSP            dTHR; djSP
 #define dMARK          register SV **mark = stack_base + POPMARK
 #define dORIGMARK      I32 origmark = mark - stack_base
 #define SETORIGMARK    origmark = mark - stack_base