More GCC warnings

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * data/yacc.c (yydestruct, yysymprint): Pacify GCC warnings for
        unused variables.
        * src/output.c (merger_output): static.

Index: data/yacc.c
===================================================================
RCS file: /cvsroot/bison/bison/data/yacc.c,v
retrieving revision 1.1
diff -u -u -r1.1 yacc.c
--- data/yacc.c 27 Jun 2002 12:08:20 -0000 1.1
+++ data/yacc.c 28 Jun 2002 09:04:13 -0000
@@ -1265,6 +1265,11 @@
 yydestruct (int yytype,
            YYSTYPE yyvalue[]b4_location_if([, YYLTYPE yylocation]))
 {
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvalue;
+b4_location_if([  (void) yylocation;
+])dnl
+
   switch (yytype)
     {
 m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))dnl
@@ -1283,6 +1288,11 @@
 yysymprint (FILE* yyout, int yytype,
            YYSTYPE yyvalue[]b4_location_if([, YYLTYPE yylocation]))
 {
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvalue;
+b4_location_if([  (void) yylocation;
+])dnl
+
   if (yytype < YYNTOKENS)
     {
       YYFPRINTF (yyout, "token %s (", yytname[[yytype]]);
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.170
diff -u -u -r1.170 output.c
--- src/output.c 28 Jun 2002 08:41:45 -0000 1.170
+++ src/output.c 28 Jun 2002 09:04:13 -0000
@@ -660,7 +660,7 @@
 | Output the merge functions to OUT.   |
 `--------------------------------------*/
 
-void
+static void
 merger_output (FILE *out)
 {
   int n;
Index: src/parse-gram.c
===================================================================
RCS file: /cvsroot/bison/bison/src/parse-gram.c,v
retrieving revision 1.17
diff -u -u -r1.17 parse-gram.c
--- src/parse-gram.c 28 Jun 2002 02:26:43 -0000 1.17
+++ src/parse-gram.c 28 Jun 2002 09:04:13 -0000
@@ -236,7 +236,7 @@
   char *string;
   associativity assoc;
 } yystype;
-/* Line 272 of 
/home/cs/hilfingr/work/grammars/glr2/install/share/bison/yacc.c.  */
+/* Line 272 of /home/lrde/prof/akim/src/bison/data/yacc.c.  */
 #line 241 "parse-gram.c"
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
@@ -257,7 +257,7 @@
 /* Copy the second part of user declarations.  */
 
 
-/* Line 292 of 
/home/cs/hilfingr/work/grammars/glr2/install/share/bison/yacc.c.  */
+/* Line 292 of /home/lrde/prof/akim/src/bison/data/yacc.c.  */
 #line 262 "parse-gram.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -1520,7 +1520,7 @@
 
     }
 
-/* Line 1040 of 
/home/cs/hilfingr/work/grammars/glr2/install/share/bison/yacc.c.  */
+/* Line 1040 of /home/lrde/prof/akim/src/bison/data/yacc.c.  */
 #line 1525 "parse-gram.c"
 
   yyvsp -= yylen;
@@ -1748,6 +1748,10 @@
 yydestruct (int yytype,
            YYSTYPE yyvalue, YYLTYPE yylocation)
 {
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvalue;
+  (void) yylocation;
+
   switch (yytype)
     {
       default:
@@ -1765,6 +1769,10 @@
 yysymprint (FILE* yyout, int yytype,
            YYSTYPE yyvalue, YYLTYPE yylocation)
 {
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvalue;
+  (void) yylocation;
+
   if (yytype < YYNTOKENS)
     {
       YYFPRINTF (yyout, "token %s (", yytname[yytype]);
Index: src/parse-gram.h
===================================================================
RCS file: /cvsroot/bison/bison/src/parse-gram.h,v
retrieving revision 1.14
diff -u -u -r1.14 parse-gram.h
--- src/parse-gram.h 28 Jun 2002 02:26:44 -0000 1.14
+++ src/parse-gram.h 28 Jun 2002 09:04:13 -0000
@@ -111,7 +111,7 @@
   char *string;
   associativity assoc;
 } yystype;
-/* Line 1343 of 
/home/cs/hilfingr/work/grammars/glr2/install/share/bison/yacc.c.  */
+/* Line 1353 of /home/lrde/prof/akim/src/bison/data/yacc.c.  */
 #line 116 "y.tab.h"
 # define YYSTYPE yystype
 #endif