From 5c3853d4e702aa0b44561521f6c6357a7f399c85 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Tue, 23 Jul 2013 15:56:13 +0200
Subject: [PATCH] Adjustments to compile with new bison (2.7.x).

---
 configure.ac     |  1 -
 src/Makefile.am  |  2 +-
 src/lexycal.fl   |  1 +
 src/lexycal.yy.c | 39 ++++++++++++++++++++-------------------
 src/lexycal.yy.h |  2 +-
 src/rptmarshal.c |  2 +-
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index 35f15c6..2a04c6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,6 @@ LT_INIT
 AC_LIBTOOL_WIN32_DLL
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
diff --git a/src/Makefile.am b/src/Makefile.am
index 62eefed..b3ec294 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = $(REPTOOL_CFLAGS) \
 parser.tab.c parser.tab.h: parser.y
 	bison -d parser.y
 
-laxycal.yy.c lexycal.yy.h: lexycal.fl
+lexycal.yy.c lexycal.yy.h: lexycal.fl
 	flex -o lexycal.yy.c --header-file=lexycal.yy.h lexycal.fl
 
 lib_LTLIBRARIES = libreptool.la
diff --git a/src/lexycal.fl b/src/lexycal.fl
index 87b7068..98e51c6 100644
--- a/src/lexycal.fl
+++ b/src/lexycal.fl
@@ -3,6 +3,7 @@
 
 #include <glib.h>
 
+#include "rptreport_priv.h"
 #include "parser.tab.h"
 %}
 
diff --git a/src/lexycal.yy.c b/src/lexycal.yy.c
index 8c05341..cc00d0d 100644
--- a/src/lexycal.yy.c
+++ b/src/lexycal.yy.c
@@ -496,8 +496,9 @@ char *yytext;
 
 #include <glib.h>
 
+#include "rptreport_priv.h"
 #include "parser.tab.h"
-#line 501 "lexycal.yy.c"
+#line 502 "lexycal.yy.c"
 
 #define INITIAL 0
 
@@ -684,10 +685,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 11 "lexycal.fl"
+#line 12 "lexycal.fl"
 
 
-#line 691 "lexycal.yy.c"
+#line 692 "lexycal.yy.c"
 
 	if ( !(yy_init) )
 		{
@@ -772,7 +773,7 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 13 "lexycal.fl"
+#line 14 "lexycal.fl"
 {
 			/*printf("An integer: %d\n", atoi (yytext));*/
 			yylval = g_strdup (yytext);
@@ -781,7 +782,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 19 "lexycal.fl"
+#line 20 "lexycal.fl"
 {
 					/*printf("A float: %f\n", atof (yytext));*/
 					yylval = g_strdup (yytext);
@@ -791,7 +792,7 @@ YY_RULE_SETUP
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 25 "lexycal.fl"
+#line 26 "lexycal.fl"
 {
 			/*printf ("A string: %s\n", yytext);*/
 			yylval = g_strdup (yytext);
@@ -801,7 +802,7 @@ YY_RULE_SETUP
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 31 "lexycal.fl"
+#line 32 "lexycal.fl"
 {
 			/*printf ("A field: %s\n", yytext);*/
 			yylval = g_strdup (yytext);
@@ -809,21 +810,21 @@ YY_RULE_SETUP
 			}
 	YY_BREAK
 case 5:
-#line 38 "lexycal.fl"
-case 6:
 #line 39 "lexycal.fl"
-case 7:
+case 6:
 #line 40 "lexycal.fl"
+case 7:
+#line 41 "lexycal.fl"
 case 8:
 /* rule 8 can match eol */
-#line 41 "lexycal.fl"
+#line 42 "lexycal.fl"
 case 9:
 /* rule 9 can match eol */
-#line 42 "lexycal.fl"
+#line 43 "lexycal.fl"
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 42 "lexycal.fl"
+#line 43 "lexycal.fl"
 {
 		/*printf ("A special value: %s\n", yytext);*/
 		yylval = g_strdup (yytext);
@@ -832,7 +833,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 48 "lexycal.fl"
+#line 49 "lexycal.fl"
 {
 					/*printf ("An operator: %s\n", yytext );*/
 					yylval = NULL;
@@ -841,7 +842,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 54 "lexycal.fl"
+#line 55 "lexycal.fl"
 {
 								/*printf ("A function: %s\n", yytext);*/
 								yylval = g_strdup (yytext);
@@ -851,15 +852,15 @@ YY_RULE_SETUP
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
-#line 60 "lexycal.fl"
+#line 61 "lexycal.fl"
 /* eat up unmatched chars */
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 62 "lexycal.fl"
+#line 63 "lexycal.fl"
 ECHO;
 	YY_BREAK
-#line 863 "lexycal.yy.c"
+#line 864 "lexycal.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1857,7 +1858,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 62 "lexycal.fl"
+#line 63 "lexycal.fl"
 
 
 
diff --git a/src/lexycal.yy.h b/src/lexycal.yy.h
index b35abc0..5751ed3 100644
--- a/src/lexycal.yy.h
+++ b/src/lexycal.yy.h
@@ -324,7 +324,7 @@ extern int yylex (void);
 #undef YY_DECL
 #endif
 
-#line 62 "lexycal.fl"
+#line 63 "lexycal.fl"
 
 
 #line 331 "lexycal.yy.h"
diff --git a/src/rptmarshal.c b/src/rptmarshal.c
index 803b1f0..98073d0 100644
--- a/src/rptmarshal.c
+++ b/src/rptmarshal.c
@@ -4,7 +4,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
-- 
2.49.0