--- ray/src/common/caldefn.c	2003/07/21 22:30:17	2.19
+++ ray/src/common/caldefn.c	2003/07/27 22:12:01	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: caldefn.c,v 2.19 2003/07/21 22:30:17 schorsch Exp $";
+static const char	RCSid[] = "$Id: caldefn.c,v 2.20 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  *  Store variable definitions.
@@ -259,7 +259,7 @@ popcontext(void)			/* pop off top context */
     while (*++cp2 && *cp2 != CNTXMARK)
 	;
     cp1 = context;			/* copy tail to front */
-    while (*cp1++ = *cp2++)
+    while ( (*cp1++ = *cp2++) )
 	;
     return(context);
 }
@@ -707,7 +707,7 @@ dvalue(char  *name, EPNODE	*d)
     if (eclock >= MAXCLOCK)
 	eclock = 1;				/* wrap clock counter */
     if (ep2->v.tick < MAXCLOCK &&
-		ep2->v.tick == 0 | ep2->v.tick != eclock) {
+		(ep2->v.tick == 0) | (ep2->v.tick != eclock)) {
 	ep2->v.tick = d->type == ':' ? MAXCLOCK : eclock;
 	ep2 = ep2->sibling;
 	ep2->v.num = evalue(ep1);		/* needs new value */