* src/roff/troff/input.cpp (interpolate_arg): Remove compiler

warning.

* src/preproc/eqn/pile.cpp (pile_box::output, matrix_box::output):
Remove compiler warning.

* src/preproc/refer/label.y: Remove compiler warning.

* src/preproc/pic/pic.y: Remove doubled token entries.

4 files changed, 6 insertions, 11 deletions

diff --git a/src/preproc/eqn/pile.cpp b/src/preproc/eqn/pile.cpp
index eba09dc3..e1fd6c11 100644
--- a/src/preproc/eqn/pile.cpp
+++ b/src/preproc/eqn/pile.cpp
@@ -99,7 +99,7 @@ void pile_box::output()
     printf("\\h'\\n[" WIDTH_FORMAT "]u'", uid);
   }
   else if (output_format == mathml) {
-    char *av;
+    const char *av;
     switch (col.align) {
     case LEFT_ALIGN:
       av = "left";
@@ -242,7 +242,7 @@ void matrix_box::output()
     for (int i = 0; i < n; i++) {
       printf("<mtr>");
       for (int j = 0; j < len; j++) {
-	char *av;
+	const char *av;
 	switch (p[j]->align) {
 	case LEFT_ALIGN:
 	  av = "left";
diff --git a/src/preproc/pic/pic.y b/src/preproc/pic/pic.y
index c73d3685..2f838da3 100644
--- a/src/preproc/pic/pic.y
+++ b/src/preproc/pic/pic.y
@@ -1,5 +1,5 @@
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006
+                 2006, 2007
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -94,10 +94,6 @@ char *do_sprintf(const char *form, const double *v, int nv);
 %token RIGHT_ARROW_HEAD
 %token DOUBLE_ARROW_HEAD
 %token LAST
-%token UP
-%token DOWN
-%token LEFT
-%token RIGHT
 %token BOX
 %token CIRCLE
 %token ELLIPSE
diff --git a/src/preproc/refer/label.y b/src/preproc/refer/label.y
index d76f95ef..96ccc7f1 100644
--- a/src/preproc/refer/label.y
+++ b/src/preproc/refer/label.y
@@ -1,5 +1,5 @@
 /* -*- C++ -*-
-   Copyright (C) 1989, 1990, 1991, 1992, 2000, 2004
+   Copyright (C) 1989, 1990, 1991, 1992, 2000, 2004, 2007
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -28,7 +28,6 @@ Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
 
 int yylex();
 void yyerror(const char *);
-int yyparse();
 
 static const char *format_serial(char c, int n);
 
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 414bad8b..6e8b269e 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -4288,13 +4288,13 @@ static void interpolate_arg(symbol nm)
     string args;
     for (int i = 1; i <= limit; i++) {
       args += '"';
-      args += BEGIN_QUOTE;
+      args += char(BEGIN_QUOTE);
       input_iterator *p = input_stack::get_arg(i);
       int c;
       while ((c = p->get(0)) != EOF)
 	if (c != DOUBLE_QUOTE)
 	  args += c;
-      args += END_QUOTE;
+      args += char(END_QUOTE);
       args += '"';
       if (i != limit)
 	args += ' ';