From: Bruno Haible Date: Sun, 7 Dec 2008 21:43:39 +0000 (+0000) Subject: Avoid gcc -Wredundant-decls warnings. X-Git-Tag: v0.18~286 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d8067814c1ea614523a5af58afcb7fa847c7440;p=thirdparty%2Fgettext.git Avoid gcc -Wredundant-decls warnings. --- diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 4ac3abc6d..46963ae28 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,25 @@ +2008-12-07 Bruno Haible + + 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 * msgfilter.c: Include xvasprintf.h, xsetenv.h. diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c index 9c75ad898..0e74852e9 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 , 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 14438a4ce..371ba0c06 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 @@ -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 9c73fc8ca..6a1a31efb 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 f4df5916e..076c8ee84 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 , 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 ddb2f9a99..3d48e72e8 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 , 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 ae32e64b4..c8064c534 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 33fadc2dd..e2279a4f7 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 , 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 f586051b4..5495dffa7 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 , 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 d468e0d2b..3064b2c63 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 0a86b697f..0f7ad78af 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 c2c9de8d7..9d9317246 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 @@ -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 e12b0e9ae..af6a139c8 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 d14b2257b..160db65d7 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 , 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 efc36ed16..5c8fdb0a0 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 , 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 44ad49d5d..8ebf10f84 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 , 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 dc2d850b5..7da3a5542 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 , 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 bc62f4c84..52314774c 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 , 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 9ab14ac46..59e8e1402 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 , 2001. @@ -31,7 +31,6 @@ #include "message.h" #include "xgettext.h" -#include "x-ycp.h" #include "error.h" #include "xalloc.h" #include "gettext.h"