From 0606e2fbfa0ad59130cd7d925fbec92afc05a8b1 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Tue, 27 Jul 2004 21:03:51 +0000
Subject: [PATCH] rename exp() to expx() to avoid conflict with gcc-3.4
 built-in.

---
 usr.bin/m4/expr.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 7727d6e9f0..070cfd67e2 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -39,7 +39,7 @@
  * @(#)expr.c	8.2 (Berkeley) 4/29/95
  * $OpenBSD: expr.c,v 1.14 2002/04/26 16:15:16 espie Exp $
  * $FreeBSD: src/usr.bin/m4/expr.c,v 1.3.12.1 2002/07/15 02:06:15 jmallett Exp $
- * $DragonFly: src/usr.bin/m4/expr.c,v 1.2 2003/06/17 04:29:28 dillon Exp $
+ * $DragonFly: src/usr.bin/m4/expr.c,v 1.3 2004/07/27 21:03:51 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -115,7 +115,7 @@ static int eqrel(void);
 static int shift(void);
 static int primary(void);
 static int term(void);
-static int exp(void);
+static int expx(void);
 static int unary(void);
 static int factor(void);
 static int constant(void);
@@ -330,9 +330,9 @@ term(void)
 {
 	int c, vl, vr;
 
-	vl = exp();
+	vl = expx();
 	while ((c = skipws()) == '*' || c == '/' || c == '%') {
-		vr = exp();
+		vr = expx();
 
 		switch (c) {
 		case '*':
@@ -360,7 +360,7 @@ term(void)
  * <term> := <unary> { <expop> <unary> }
  */
 static int
-exp(void)
+expx(void)
 {
 	int c, vl, vr, n;
 
@@ -374,7 +374,7 @@ exp(void)
 		}
 
 	case '^':
-		vr = exp();
+		vr = expx();
 		n = 1;
 		while (vr-- > 0)
 			n *= vl;
-- 
2.41.0