[pkgsrc/trunk]: pkgsrc/devel/bcc Rename exp2, GCC 3.4 considers it to be a bu...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62b22ebd0859
branches:  trunk
changeset: 505879:62b22ebd0859
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 08 19:50:30 2006 +0000

description:
Rename exp2, GCC 3.4 considers it to be a builtin.

diffstat:

 devel/bcc/distinfo         |   3 ++-
 devel/bcc/patches/patch-at |  40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletions(-)

diffs (58 lines):

diff -r 828ece301b27 -r 62b22ebd0859 devel/bcc/distinfo
--- a/devel/bcc/distinfo        Sun Jan 08 19:38:54 2006 +0000
+++ b/devel/bcc/distinfo        Sun Jan 08 19:50:30 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 22:24:10 agc Exp $
+$NetBSD: distinfo,v 1.13 2006/01/08 19:50:30 joerg Exp $
 
 SHA1 (bcc.tar.gz) = 6a5c47bde0a6ddf82b65569883a5a490deb7e9b2
 RMD160 (bcc.tar.gz) = 6ce1a333bb4ffa36d9cea5c116925f74db64345e
@@ -22,3 +22,4 @@
 SHA1 (patch-aq) = c2ab59da541bfe4233a36f5953ba1f251b29983f
 SHA1 (patch-ar) = a1c9eeaaff393214cf5addce1f80f0dbb5d8b8d2
 SHA1 (patch-as) = 97cb1871dd055b45a000a1688e32ebf838999783
+SHA1 (patch-at) = 7f121955b757657dca22128823f08fb18cf419a3
diff -r 828ece301b27 -r 62b22ebd0859 devel/bcc/patches/patch-at
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/bcc/patches/patch-at        Sun Jan 08 19:50:30 2006 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-at,v 1.1 2006/01/08 19:50:30 joerg Exp $
+
+--- bcc/express.c.orig 2006-01-08 19:45:09.000000000 +0000
++++ bcc/express.c
+@@ -21,7 +21,7 @@ PRIVATE unsigned insizeof;   /* nest level
+ /* on p49 of K & R */
+ 
+ FORWARD struct nodestruct *cast_exp P((void));
+-FORWARD struct nodestruct *exp2 P((void));
++FORWARD struct nodestruct *my_exp2 P((void));
+ FORWARD struct nodestruct *exp3to12 P((fastin_pt lprecedence));
+ FORWARD struct nodestruct *listargs P((void));
+ FORWARD struct nodestruct *postfix_exp P((bool_pt seenlp));
+@@ -55,7 +55,7 @@ PUBLIC struct nodestruct *assignment_exp
+     struct nodestruct *lhs;
+     op_pt op;
+ 
+-    lhs = exp2();
++    lhs = my_exp2();
+     if (sym >= ASSIGNOP && sym <= SUBABOP)    /* assign-op syms in order! */
+     {
+       op = sym;
+@@ -78,7 +78,7 @@ PUBLIC struct nodestruct *expression()
+     return lhs;
+ }
+ 
+-PRIVATE struct nodestruct *exp2()
++PRIVATE struct nodestruct *my_exp2()
+ {
+     struct nodestruct *lhs;
+     struct nodestruct *rhs;
+@@ -89,7 +89,7 @@ PRIVATE struct nodestruct *exp2()
+       nextsym();
+       rhs = expression();
+       colon();
+-      lhs = node(CONDOP, lhs, node(COLONOP, rhs, exp2()));
++      lhs = node(CONDOP, lhs, node(COLONOP, rhs, my_exp2()));
+     }
+     return lhs;
+ }