Initial 3-way merge from (5.001m, thr1m, 5.003) plus fixups.

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

diff --git a/pp.h b/pp.h
index 44a3ebe..7fe8f76 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -7,10 +7,15 @@
  *
  */
 
+#ifdef USE_THREADS
+#define ARGS thr
+#define dARGS struct thread *thr;
+#define PP(s) OP* s(ARGS) dARGS
+#else
 #define ARGS
-#define ARGSproto void
 #define dARGS
 #define PP(s) OP* s(ARGS) dARGS
+#endif /* USE_THREADS */
 
 #define SP sp
 #define MARK mark