2009-02-08 [mones] 3.7.0cvs56

	* src/matcher.h
		Fix build for bison 2.4.1

diff --git a/ChangeLog b/ChangeLog
index e765053fcdab0b3cb712d405afed8c689ef72e29..64c63a0ba9ef53fc1951809f30e1438db82e47c8 100644 (file)
--- 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
 2009-02-06 [holger]    3.7.0cvs55
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index fa27dea4d08898e3ae26a3b208dae929b698179c..a1a0973276705e759957a45560826a14df4c458d 100644 (file)
--- 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.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
index 0807484112bd745e23e7e3970b7677ad68716be8..abf30d04f73536920e1ef598bba344c0e56d2ad7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=55
+EXTRA_VERSION=56

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher.h b/src/matcher.h
index 37e7c4c9ce41d8fb258b8387d84b21061bafd9b5..e46e86ab9604b57113f8074a08a422aa977fab3e 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -26,10 +26,8 @@
 #include "procmsg.h"
 
 /* constants generated by yacc */
 #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;
 
 struct _MatcherProp {
        int matchtype;