This commit was generated by cvs2svn to compensate for changes in r55839,

which included commits to RCS files with non-trunk default branches.

2 files changed, 3 insertions, 3 deletions

diff --git a/contrib/groff/grops/ps.cc b/contrib/groff/grops/ps.cc
index 49ed9d4a5157..053161a41688 100644
--- a/contrib/groff/grops/ps.cc
+++ b/contrib/groff/grops/ps.cc
@@ -502,7 +502,7 @@ class ps_printer : public printer {
 public:
   ps_printer();
   ~ps_printer();
-  void set_char(int i, font *f, const environment *env, int w);
+  void set_char(int i, font *f, const environment *env, int w, const char *name);
   void draw(int code, int *p, int np, const environment *env);
   void begin_page(int);
   void end_page(int);
@@ -565,7 +565,7 @@ int ps_printer::set_encoding_index(ps_font *f)
   return f->encoding_index = next_encoding_index++;
 }
 
-void ps_printer::set_char(int i, font *f, const environment *env, int w)
+void ps_printer::set_char(int i, font *f, const environment *env, int w, const char *name)
 {
   if (i == space_char_index || invis_count > 0)
     return;
diff --git a/contrib/groff/grops/psrm.cc b/contrib/groff/grops/psrm.cc
index 3030aef88249..140b154e70c5 100644
--- a/contrib/groff/grops/psrm.cc
+++ b/contrib/groff/grops/psrm.cc
@@ -962,7 +962,7 @@ void resource_manager::process_file(int rank, FILE *fp, const char *filename,
 	      had_language_level_comment = 1;
 	    }
 	    else {
-	      for (int i = 0; i < NHEADER_COMMENTS; i++)
+	      for (i = 0; i < NHEADER_COMMENTS; i++)
 		if (matches_comment(buf, header_comment_table[i])) {
 		  interesting = 1;
 		  break;