Avoid gcc -Wredundant-decls warnings.

19 files changed, 35 insertions, 33 deletions

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 4ac3abc..46963ae 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,25 @@
+2008-12-07  Bruno Haible  <bruno@clisp.org>
+
+	Avoid gcc -Wredundant-decls warnings.
+	* x-awk.c: Don't include the specification header file twice.
+	* x-c.c: Likewise.
+	* x-csharp.c: Likewise.
+	* x-elisp.c: Likewise.
+	* x-glade.c: Likewise.
+	* x-java.c: Likewise.
+	* x-librep.c: Likewise.
+	* x-lisp.c: Likewise.
+	* x-perl.c: Likewise.
+	* x-php.c: Likewise.
+	* x-po.c: Likewise.
+	* x-python.c: Likewise.
+	* x-rst.c: Likewise.
+	* x-scheme.c: Likewise.
+	* x-sh.c: Likewise.
+	* x-smalltalk.c: Likewise.
+	* x-tcl.c: Likewise.
+	* x-ycp.c: Likewise.
+
 2008-11-14  Bruno Haible  <bruno@clisp.org>
 
 	* msgfilter.c: Include xvasprintf.h, xsetenv.h.
diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c
index 9c75ad8..0e74852 100644
--- a/gettext-tools/src/x-awk.c
+++ b/gettext-tools/src/x-awk.c
@@ -1,5 +1,5 @@
 /* xgettext awk backend.
-   Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-awk.h"
 #include "error.h"
 #include "error-progname.h"
 #include "xalloc.h"
diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 14438a4..371ba0c 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -1,5 +1,5 @@
 /* xgettext C/C++/ObjectiveC backend.
-   Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2008 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-c.h"
 #include "error.h"
 #include "error-progname.h"
 #include "xalloc.h"
diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
index 9c73fc8..6a1a31e 100644
--- a/gettext-tools/src/x-csharp.c
+++ b/gettext-tools/src/x-csharp.c
@@ -30,7 +30,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-csharp.h"
 #include "c-ctype.h"
 #include "error.h"
 #include "error-progname.h"
diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c
index f4df591..076c8ee 100644
--- a/gettext-tools/src/x-elisp.c
+++ b/gettext-tools/src/x-elisp.c
@@ -1,5 +1,5 @@
 /* xgettext Emacs Lisp backend.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001-2002.
 
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-elisp.h"
 #include "error.h"
 #include "xalloc.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c
index ddb2f9a..3d48e72 100644
--- a/gettext-tools/src/x-glade.c
+++ b/gettext-tools/src/x-glade.c
@@ -1,5 +1,5 @@
 /* xgettext glade backend.
-   Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -39,7 +39,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-glade.h"
 #include "error.h"
 #include "xerror.h"
 #include "xvasprintf.h"
diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c
index ae32e64..c8064c5 100644
--- a/gettext-tools/src/x-java.c
+++ b/gettext-tools/src/x-java.c
@@ -30,7 +30,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-java.h"
 #include "error.h"
 #include "xalloc.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c
index 33fadc2..e2279a4 100644
--- a/gettext-tools/src/x-librep.c
+++ b/gettext-tools/src/x-librep.c
@@ -1,5 +1,5 @@
 /* xgettext librep backend.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -32,7 +32,6 @@
 #include "c-ctype.h"
 #include "message.h"
 #include "xgettext.h"
-#include "x-librep.h"
 #include "error.h"
 #include "xalloc.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-lisp.c b/gettext-tools/src/x-lisp.c
index f586051..5495dff 100644
--- a/gettext-tools/src/x-lisp.c
+++ b/gettext-tools/src/x-lisp.c
@@ -1,5 +1,5 @@
 /* xgettext Lisp backend.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-lisp.h"
 #include "error.h"
 #include "xalloc.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index d468e0d..3064b2c 100644
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-perl.h"
 #include "error.h"
 #include "error-progname.h"
 #include "xalloc.h"
diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index 0a86b69..0f7ad78 100644
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -30,7 +30,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-php.h"
 #include "error.h"
 #include "xalloc.h"
 #include "gettext.h"
diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c
index c2c9de8..9d93172 100644
--- a/gettext-tools/src/x-po.c
+++ b/gettext-tools/src/x-po.c
@@ -1,5 +1,5 @@
 /* xgettext PO and JavaProperties backends.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -32,9 +32,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-po.h"
-#include "x-properties.h"
-#include "x-stringtable.h"
 #include "xalloc.h"
 #include "read-catalog.h"
 #include "read-po.h"
diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index e12b0e9..af6a139 100644
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -32,7 +32,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-python.h"
 #include "error.h"
 #include "error-progname.h"
 #include "progname.h"
diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
index d14b225..160db65 100644
--- a/gettext-tools/src/x-rst.c
+++ b/gettext-tools/src/x-rst.c
@@ -1,5 +1,5 @@
 /* xgettext RST backend.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -31,7 +31,6 @@
 #include "c-ctype.h"
 #include "message.h"
 #include "xgettext.h"
-#include "x-rst.h"
 #include "error.h"
 #include "error-progname.h"
 #include "xalloc.h"
diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c
index efc36ed..5c8fdb0 100644
--- a/gettext-tools/src/x-scheme.c
+++ b/gettext-tools/src/x-scheme.c
@@ -1,5 +1,5 @@
 /* xgettext Scheme backend.
-   Copyright (C) 2004-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2004-2005.
 
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-scheme.h"
 #include "error.h"
 #include "xalloc.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c
index 44ad49d..8ebf10f 100644
--- a/gettext-tools/src/x-sh.c
+++ b/gettext-tools/src/x-sh.c
@@ -1,5 +1,5 @@
 /* xgettext sh backend.
-   Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-sh.h"
 #include "error.h"
 #include "xalloc.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-smalltalk.c b/gettext-tools/src/x-smalltalk.c
index dc2d850..7da3a55 100644
--- a/gettext-tools/src/x-smalltalk.c
+++ b/gettext-tools/src/x-smalltalk.c
@@ -1,5 +1,5 @@
 /* xgettext Smalltalk backend.
-   Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -29,7 +29,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-smalltalk.h"
 #include "error.h"
 #include "xalloc.h"
 #include "gettext.h"
diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c
index bc62f4c..5231477 100644
--- a/gettext-tools/src/x-tcl.c
+++ b/gettext-tools/src/x-tcl.c
@@ -1,5 +1,5 @@
 /* xgettext Tcl backend.
-   Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -33,7 +33,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-tcl.h"
 #include "error.h"
 #include "xalloc.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-ycp.c b/gettext-tools/src/x-ycp.c
index 9ab14ac..59e8e14 100644
--- a/gettext-tools/src/x-ycp.c
+++ b/gettext-tools/src/x-ycp.c
@@ -1,5 +1,5 @@
 /* xgettext YCP backend.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -31,7 +31,6 @@
 
 #include "message.h"
 #include "xgettext.h"
-#include "x-ycp.h"
 #include "error.h"
 #include "xalloc.h"
 #include "gettext.h"