From f25e13d38910bc47725c82da52142f62de39fe99 Mon Sep 17 00:00:00 2001
From: Alexandre Bique <bique.alexandre@gmail.com>
Date: Sat, 4 Apr 2009 16:22:27 +0100
Subject: [PATCH] updated bison's patch

---
 patches/bison-glr.c-header-guard.patch | 19 -------------------
 patches/glr.c-header-guard.patch       | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 19 deletions(-)
 delete mode 100644 patches/bison-glr.c-header-guard.patch
 create mode 100644 patches/glr.c-header-guard.patch

diff --git a/patches/bison-glr.c-header-guard.patch b/patches/bison-glr.c-header-guard.patch
deleted file mode 100644
index afd3c9c..0000000
--- a/patches/bison-glr.c-header-guard.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- glr.c-bad	2009-01-17 02:20:56.000000000 +0100
-+++ glr.c-good	2009-01-17 02:22:49.000000000 +0100
-@@ -2640,7 +2640,8 @@
- [@output(b4_spec_defines_file@)
- b4_copyright([Skeleton interface for Bison GLR parsers in C],
-   [2002, 2003, 2004, 2005, 2006])
--
-+#ifndef PARSER_HEADER_H
-+# define PARSER_HEADER_H
- b4_shared_declarations
- 
- b4_pure_if([],
-@@ -2650,4 +2651,6 @@
- [extern YYLTYPE ]b4_prefix[lloc;])
- ])
- ])])
-+#endif /* !PARSER_HEADER_H */
- m4_divert_pop(0)
-+
diff --git a/patches/glr.c-header-guard.patch b/patches/glr.c-header-guard.patch
new file mode 100644
index 0000000..6bb6b9e
--- /dev/null
+++ b/patches/glr.c-header-guard.patch
@@ -0,0 +1,25 @@
+--- /usr/share/bison/glr.c	2008-12-12 09:29:32.000000000 +0000
++++ glr.c	2009-04-04 01:07:36.000000000 +0100
+@@ -2631,6 +2631,7 @@
+ #endif
+ ]
+ 
++m4_define(b4_header_prefix,m4_translit(b4_prefix, `[a-z:]', `[A-Z_]'))
+ b4_epilogue
+ dnl
+ dnl glr.cc produces its own header.
+@@ -2641,6 +2642,8 @@
+ b4_copyright([Skeleton interface for Bison GLR parsers in C],
+   [2002, 2003, 2004, 2005, 2006])
+ 
++#ifndef b4_header_prefix[]_PARSER_HEADER_H
++# define b4_header_prefix[]_PARSER_HEADER_H
+ b4_shared_declarations
+ 
+ b4_pure_if([],
+@@ -2650,4 +2653,5 @@
+ [extern YYLTYPE ]b4_prefix[lloc;])
+ ])
+ ])])
++#endif /* !b4_header_prefix[]_PARSER_HEADER_H */
+ m4_divert_pop(0)
-- 
2.11.4.GIT