Avoid gcc -Wmissing-prototypes warnings.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index f125d93ce49dd7848299f1d43fdd0cbd4e4a035e..b8976fb54d9db57e49cc41b573d52e39c3214064 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp
index a5402d642c050dfca2253359f51c43d6545232e9..6be82fca6068e6a86c8c559b6ac53e2f90560d60 100755 (executable)
--- 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 0effcbe5412471264e3ebf2434e1d31f6d776237..4d3957f1e13ffa9ed5f2c67e7e86a08964a0fbb5 100644 (file)
--- 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 bc5339787f4df40edd385d35ccd2fb0998eb698c..3e2c950cea82850161b2ada25d1b166fac610239 100644 (file)
--- 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;