Tweaks to allow compilation without -DUSE_THREADS and fix

missing parens (pad allocation) in the tokener.

p4raw-id: //depot/thrperl@5

diff --git a/op.c b/op.c
index ca6d445..b86227b 100644 (file)
--- a/op.c
+++ b/op.c
@@ -2508,6 +2508,7 @@ I32 flags;
 OP *left;
 OP *right;
 {
+    dTHR;
     CONDOP *condop;
     OP *flip;
     OP *flop;

diff --git a/pp_ctl.c b/pp_ctl.c
index 806e4d2..fb64466 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1952,12 +1952,14 @@ int gimme;
     HV *newstash;
     AV* comppadlist;
 
+#ifdef USE_THREADS
     MUTEX_LOCK(&eval_mutex);
     if (eval_owner && eval_owner != thr)
        while (eval_owner)
            COND_WAIT(&eval_cond, &eval_mutex);
     eval_owner = thr;
     MUTEX_UNLOCK(&eval_mutex);
+#endif /* USE_THREADS */
     in_eval = 1;
 
     /* set up a scratch pad */
@@ -2054,10 +2056,12 @@ int gimme;
 
     /* compiled okay, so do it */
 
+#ifdef USE_THREADS
     MUTEX_LOCK(&eval_mutex);
     eval_owner = 0;
     COND_SIGNAL(&eval_cond);
     MUTEX_UNLOCK(&eval_mutex);
+#endif /* USE_THREADS */
     RETURNOP(eval_start);
 }
 

diff --git a/toke.c b/toke.c
index 270cf45..90576e7 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -2115,7 +2115,7 @@ yylex()
                    if (*s == '{')
                        tokenbuf[0] = '%';
                }
-               if (tmp = pad_findmy(tokenbuf) != NOT_IN_PAD) {
+               if ((tmp = pad_findmy(tokenbuf)) != NOT_IN_PAD) {
                    nextval[nexttoke].opval = newOP(OP_PADANY, 0);
                    nextval[nexttoke].opval->op_targ = tmp;
                    force_next(PRIVATEREF);