Avoid gcc -Wredundant-decls warnings.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 4ac3abc6d39a7573edae1d72625ab3a375aefd33..46963ae289ddf65015e172c9c558542e928ace9a 100644 (file)
--- 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 9c75ad8988884b1e84b4774567f9e00c536c8435..0e74852e9bdf6b3259dac2f979846fadc130bd6a 100644 (file)
--- 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 14438a4ceb44a9c898555ebe1ad587642b7b75ef..371ba0c06672d4d80e4e9824aa34b23b17529e37 100644 (file)
--- 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 9c73fc8ca7f94ff8ed6a7fed562e6ac8802866ae..6a1a31efb83729a1ee67dd0f332bb98d4b8e9c8d 100644 (file)
--- 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 f4df5916e39b2dbd213451f057d5f08a5bac0643..076c8ee841bc7d17f5ff23922bc5b1bf2c3a4c9a 100644 (file)
--- 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 ddb2f9a99a3b27997318a2ec02a8282276c6f7d1..3d48e72e82e3f260392db51bef19d7c0fcdff9ef 100644 (file)
--- 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 ae32e64b4afe48445e3c0c5f278b39c64304b74f..c8064c5340bde9c3fb6d3b85b5d705a8d6f45127 100644 (file)
--- 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 33fadc2dd16db9da1e0133b3a5d65c532b3a3bf8..e2279a4f7352880f7ec4011c96cddbe1ded941ad 100644 (file)
--- 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 f586051b43ce5b764b688d4b883931acfe4b0e6d..5495dffa7533da20f4e75bdcde410be7dfd0ce4e 100644 (file)
--- 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 d468e0d2b6524c2820abd874831f351ccb89f4d5..3064b2c638e50f1f97a83982dbafbfc4a42b3e59 100644 (file)
--- 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 0a86b697fda21769fe1b1fc0bae25826edbaa1f6..0f7ad78af4a5c3359371c3e80c26249b65e788f5 100644 (file)
--- 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 c2c9de8d738263f75e62b53120687a257f830795..9d9317246eea7eefe46bf4f92e366a8da6bc58ee 100644 (file)
--- 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 e12b0e9aee5fd73d6df7f1bceb1a589cacd5c634..af6a139c8015c127a710d6f4bb1e3441986767a7 100644 (file)
--- 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 d14b2257b9d804c3aae1f1f4aeadb4e23915e47d..160db65d76e4873412f24e19cd86a2de9ad73df2 100644 (file)
--- 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 efc36ed16338baaa4675d1e1c474d8dd94790e69..5c8fdb0a005d6b7d82a29232c708eb685b2c4fc9 100644 (file)
--- 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 44ad49d5d77ce50d3d1e279db8d266696c24cfdb..8ebf10f8484a7460c00070453e40c3eba7d0652e 100644 (file)
--- 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 dc2d850b5f9cfa2ea1be1c07b0eaaff186ed2677..7da3a554212ff500c42e5112f73c4b459dc60810 100644 (file)
--- 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 bc62f4c84d9916fd3039ac8f279e1da07f2b1b2c..52314774c4d7680f9677521c82002abc2d674d83 100644 (file)
--- 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 9ab14ac46669b34dc3c1cbd5a04671e7bdf16f14..59e8e1402dde9d0da87a384a66203779f5e3543e 100644 (file)
--- 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"