From: deraadt <deraadt@openbsd.org>
Date: Tue, 20 Jul 2010 02:13:10 +0000 (+0000)
Subject: exp2() is a function in libm, so rename the csh one..
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1635ba968b107946142a7ab054d2e27f623f54eb;p=openbsd

exp2() is a function in libm, so rename the csh one..
---

diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index d66ee283c35..ffa265fb11b 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exp.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $	*/
+/*	$OpenBSD: exp.c,v 1.9 2010/07/20 02:13:10 deraadt Exp $	*/
 /*	$NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $	*/
 
 /*-
@@ -60,7 +60,7 @@
 #define NOTEQMATCH 8
 
 static int	exp1(Char ***, bool);
-static int	exp2(Char ***, bool);
+static int	exp2_(Char ***, bool);
 static int	exp2a(Char ***, bool);
 static int	exp2b(Char ***, bool);
 static int	exp2c(Char ***, bool);
@@ -108,7 +108,7 @@ exp0(Char ***vp, bool ignore)
 static int
 exp1(Char ***vp, bool ignore)
 {
-    int p1 = exp2(vp, ignore);
+    int p1 = exp2_(vp, ignore);
 
 #ifdef EDEBUG
     etraci("exp1 p1", p1, vp);
@@ -127,7 +127,7 @@ exp1(Char ***vp, bool ignore)
 }
 
 static int
-exp2(Char ***vp, bool ignore)
+exp2_(Char ***vp, bool ignore)
 {
     int p1 = exp2a(vp, ignore);
 
@@ -138,7 +138,7 @@ exp2(Char ***vp, bool ignore)
 	int p2;
 
 	(*vp)++;
-	p2 = exp2(vp, ignore);
+	p2 = exp2_(vp, ignore);
 #ifdef EDEBUG
 	etraci("exp3 p2", p2, vp);
 #endif