From 11343788cbaaede18e3146b5219d2fbdaeaf516e Mon Sep 17 00:00:00 2001
From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Fri, 28 Mar 1997 18:40:44 +0000
Subject: Initial 3-way merge from (5.001m, thr1m, 5.003) plus fixups.

p4raw-id: //depot/thrperl@4
---
 pp.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pp.h')

diff --git a/pp.h b/pp.h
index 44a3ebeb72..7fe8f76f79 100644
--- 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
-- 
cgit v1.2.1