talons

commit e4e4603d8c40f8c66bd5373df1916640d9731a88
parent 419717c2d05cc4fffcbb5304c3df4cddbe96f824
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Sun,  8 Feb 2009 20:00:42 +0000

2009-02-08 [mones]	3.7.0cvs56

	* src/matcher.h
		Fix build for bison 2.4.1

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/matcher.h
 | 
6
++----

4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-08 [mones]	3.7.0cvs56
+
+	* src/matcher.h
+		Fix build for bison 2.4.1
+
 2009-02-06 [holger]	3.7.0cvs55
 
 	* src/prefs_common.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3717,3 +3717,4 @@
 ( cvs diff -u -r 1.382.2.497 -r 1.382.2.498 src/compose.c;  ) > 3.7.0cvs53.patchset
 ( cvs diff -u -r 1.274.2.297 -r 1.274.2.298 src/mainwindow.c;  ) > 3.7.0cvs54.patchset
 ( cvs diff -u -r 1.204.2.185 -r 1.204.2.186 src/prefs_common.c;  cvs diff -u -r 1.103.2.121 -r 1.103.2.122 src/prefs_common.h;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/printing.c;  ) > 3.7.0cvs55.patchset
+( cvs diff -u -r 1.39.2.16 -r 1.39.2.17 src/matcher.h;  ) > 3.7.0cvs56.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=55
+EXTRA_VERSION=56
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/matcher.h b/src/matcher.h
@@ -26,10 +26,8 @@
 #include "procmsg.h"
 
 /* constants generated by yacc */
-#if !defined(YYBISON) && !defined(MATCHER_ALL)
-#       include "matcher_parser_lex.h"
-#	include "matcher_parser_parse.h"
-#endif
+#include "matcher_parser_lex.h"
+#include "matcher_parser_parse.h"
 
 struct _MatcherProp {
 	int matchtype;