===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/expr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/m4/expr.c	2002/02/16 21:27:48	1.12
+++ src/usr.bin/m4/expr.c	2002/04/26 12:55:01	1.13
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expr.c,v 1.12 2002/02/16 21:27:48 millert Exp $	*/
+/*	$OpenBSD: expr.c,v 1.13 2002/04/26 12:55:01 espie Exp $	*/
 /*	$NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)expr.c	8.2 (Berkeley) 4/29/95";
 #else
-static char rcsid[] = "$OpenBSD: expr.c,v 1.12 2002/02/16 21:27:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: expr.c,v 1.13 2002/04/26 12:55:01 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -166,12 +166,12 @@
 static int
 query()
 {
-	int bool, true_val, false_val;
+	int result, true_val, false_val;
 
-	bool = lor();
+	result = lor();
 	if (skipws() != '?') {
 		ungetch();
-		return bool;
+		return result;
 	}
 
 	true_val = query();
@@ -179,7 +179,7 @@
 		experr("bad query");
 
 	false_val = query();
-	return bool ? true_val : false_val;
+	return result ? true_val : false_val;
 }
 
 /*