From 323a370a9fc00de0088396d692e00162253357ad Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sun, 26 Aug 2012 17:57:08 +0000
Subject: [PATCH] Partial patch to build bison-2.5 with gcc2, this gets it up
 to unistr.c which fails to build. This may also by useful for bison-2.6.2.

---
 sys-devel/bison/patches/bison-2.5-c89.diff | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 sys-devel/bison/patches/bison-2.5-c89.diff

diff --git a/sys-devel/bison/patches/bison-2.5-c89.diff b/sys-devel/bison/patches/bison-2.5-c89.diff
new file mode 100644
index 000000000..7be2c780d
--- /dev/null
+++ b/sys-devel/bison/patches/bison-2.5-c89.diff
@@ -0,0 +1,29 @@
+diff -urN bison-2.5/src/AnnotationList.c bison-2.5-haiku/src/AnnotationList.c
+--- bison-2.5/src/AnnotationList.c	2011-03-06 16:47:12.043515904 -0800
++++ bison-2.5-haiku/src/AnnotationList.c	2012-08-26 09:54:44.000000000 -0700
+@@ -233,9 +233,10 @@
+       AnnotationList *annotation_node =
+         AnnotationList__alloc_on_obstack (
+           self->inadequacyNode->contributionCount, annotations_obstackp);
+-      annotation_node->inadequacyNode = self->inadequacyNode;
+       bool potential_contribution = false;
+       bitset *lookaheads = NULL;
++      annotation_node->inadequacyNode = self->inadequacyNode;
++
+       {
+         ContributionIndex ci;
+         for (ci = 0; ci < self->inadequacyNode->contributionCount; ++ci)
+diff -urN bison-2.5/src/ielr.c bison-2.5-haiku/src/ielr.c
+--- bison-2.5/src/ielr.c	2011-03-06 16:47:12.044564480 -0800
++++ bison-2.5-haiku/src/ielr.c	2012-08-26 10:05:25.000000000 -0700
+@@ -1032,9 +1032,9 @@
+      lookahead sets.  */
+   if (!annotation_lists)
+     {
++      state_list *node;
+       timevar_push (TV_IELR_PHASE4);
+       initialize_LA ();
+-      state_list *node;
+       for (node = first_state; node; node = node->next)
+         if (!node->state->consistent)
+           {