Avoid gcc -Wmissing-prototypes warnings.

4 files changed, 23 insertions, 15 deletions

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index f125d93..b8976fb 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,6 +1,12 @@
 2008-12-07  Bruno Haible  <bruno@clisp.org>
 
 	Avoid gcc -Wmissing-prototypes warnings.
+	* lib/html-ostream.oo.c: Mark all method implementations as static.
+	* lib/term-ostream.oo.c: Likewise.
+
+2008-12-07  Bruno Haible  <bruno@clisp.org>
+
+	Avoid gcc -Wmissing-prototypes warnings.
 	* build-aux/moopp (func_emit_source_c): Emit a prototype before the
 	synthetized functions.
 
diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp
index a5402d6..6be82fc 100755
--- a/gnulib-local/build-aux/moopp
+++ b/gnulib-local/build-aux/moopp
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Minimal Object-Oriented style PreProcessor.
 
-# Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2006.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -659,6 +659,8 @@ func_emit_source_c ()
               inherited=yes
             fi
           done
+          # First a prototype, to avoid gcc -Wmissing-prototypes warnings.
+          echo "$rettype ${main_classname}__${name} ($arglist);"
           echo "$rettype"
           echo "${main_classname}__${name} ($arglist)"
           echo "{"
diff --git a/gnulib-local/lib/html-ostream.oo.c b/gnulib-local/lib/html-ostream.oo.c
index 0effcbe..4d3957f 100644
--- a/gnulib-local/lib/html-ostream.oo.c
+++ b/gnulib-local/lib/html-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that produces HTML output.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -225,7 +225,7 @@ html_ostream::free (html_ostream_t stream)
 
 /* Implementation of html_ostream_t methods.  */
 
-void
+static void
 html_ostream::begin_span (html_ostream_t stream, const char *classname)
 {
   if (stream->last_class_stack_size > stream->curr_class_stack_size
@@ -246,7 +246,7 @@ html_ostream::begin_span (html_ostream_t stream, const char *classname)
   stream->curr_class_stack_size++;
 }
 
-void
+static void
 html_ostream::end_span (html_ostream_t stream, const char *classname)
 {
   if (!(stream->curr_class_stack_size > 0
diff --git a/gnulib-local/lib/term-ostream.oo.c b/gnulib-local/lib/term-ostream.oo.c
index bc53397..3e2c950 100644
--- a/gnulib-local/lib/term-ostream.oo.c
+++ b/gnulib-local/lib/term-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -1632,65 +1632,65 @@ term_ostream::free (term_ostream_t stream)
 
 /* Implementation of term_ostream_t methods.  */
 
-term_color_t
+static term_color_t
 term_ostream::get_color (term_ostream_t stream)
 {
   return stream->curr_attr.color;
 }
 
-void
+static void
 term_ostream::set_color (term_ostream_t stream, term_color_t color)
 {
   stream->curr_attr.color = color;
   stream->simp_attr = simplify_attributes (stream, stream->curr_attr);
 }
 
-term_color_t
+static term_color_t
 term_ostream::get_bgcolor (term_ostream_t stream)
 {
   return stream->curr_attr.bgcolor;
 }
 
-void
+static void
 term_ostream::set_bgcolor (term_ostream_t stream, term_color_t color)
 {
   stream->curr_attr.bgcolor = color;
   stream->simp_attr = simplify_attributes (stream, stream->curr_attr);
 }
 
-term_weight_t
+static term_weight_t
 term_ostream::get_weight (term_ostream_t stream)
 {
   return stream->curr_attr.weight;
 }
 
-void
+static void
 term_ostream::set_weight (term_ostream_t stream, term_weight_t weight)
 {
   stream->curr_attr.weight = weight;
   stream->simp_attr = simplify_attributes (stream, stream->curr_attr);
 }
 
-term_posture_t
+static term_posture_t
 term_ostream::get_posture (term_ostream_t stream)
 {
   return stream->curr_attr.posture;
 }
 
-void
+static void
 term_ostream::set_posture (term_ostream_t stream, term_posture_t posture)
 {
   stream->curr_attr.posture = posture;
   stream->simp_attr = simplify_attributes (stream, stream->curr_attr);
 }
 
-term_underline_t
+static term_underline_t
 term_ostream::get_underline (term_ostream_t stream)
 {
   return stream->curr_attr.underline;
 }
 
-void
+static void
 term_ostream::set_underline (term_ostream_t stream, term_underline_t underline)
 {
   stream->curr_attr.underline = underline;