Write #include <error.h>, not #include "error.h".

This is required by Gnulib, although <error.h> is not a POSIX or ISO C
standardized header file.

Reported by Collin Funk <collin.funk1@gmail.com> in
<https://lists.gnu.org/archive/html/bug-gettext/2024-02/msg00011.html>.

* gettext-runtime/src/envsubst.c: Use #include <error.h> instead of
* gettext-runtime/src/gettext.c: Likewise.
* gettext-runtime/src/ngettext.c: Likewise.
* gettext-tools/libgettextpo/gettext-po.c: Likewise.
* gettext-tools/libgrep/m-fgrep.c: Likewise.
* gettext-tools/libgrep/m-regex.c: Likewise.
* gettext-tools/src/file-list.c: Likewise.
* gettext-tools/src/format-scheme.c: Likewise.
* gettext-tools/src/format.h: Likewise.
* gettext-tools/src/hostname.c: Likewise.
* gettext-tools/src/if-error.c: Likewise.
* gettext-tools/src/msgattrib.c: Likewise.
* gettext-tools/src/msgcat.c: Likewise.
* gettext-tools/src/msgcmp.c: Likewise.
* gettext-tools/src/msgcomm.c: Likewise.
* gettext-tools/src/msgconv.c: Likewise.
* gettext-tools/src/msgen.c: Likewise.
* gettext-tools/src/msgexec.c: Likewise.
* gettext-tools/src/msgfilter.c: Likewise.
* gettext-tools/src/msgfmt.c: Likewise.
* gettext-tools/src/msggrep.c: Likewise.
* gettext-tools/src/msginit.c: Likewise.
* gettext-tools/src/msgl-cat.c: Likewise.
* gettext-tools/src/msgl-charset.c: Likewise.
* gettext-tools/src/msgmerge.c: Likewise.
* gettext-tools/src/msgunfmt.c: Likewise.
* gettext-tools/src/msguniq.c: Likewise.
* gettext-tools/src/po-error.c: Likewise.
* gettext-tools/src/po-gram-gen.y: Likewise.
* gettext-tools/src/po-lex.c: Likewise.
* gettext-tools/src/po-lex.h: Likewise.
* gettext-tools/src/po-xerror.c: Likewise.
* gettext-tools/src/read-catalog-abstract.c: Likewise.
* gettext-tools/src/read-csharp.c: Likewise.
* gettext-tools/src/read-desktop.c: Likewise.
* gettext-tools/src/read-java.c: Likewise.
* gettext-tools/src/read-mo.c: Likewise.
* gettext-tools/src/read-properties.c: Likewise.
* gettext-tools/src/read-resources.c: Likewise.
* gettext-tools/src/read-stringtable.c: Likewise.
* gettext-tools/src/read-tcl.c: Likewise.
* gettext-tools/src/recode-sr-latin.c: Likewise.
* gettext-tools/src/urlget.c: Likewise.
* gettext-tools/src/write-csharp.c: Likewise.
* gettext-tools/src/write-desktop.c: Likewise.
* gettext-tools/src/write-java.c: Likewise.
* gettext-tools/src/write-mo.c: Likewise.
* gettext-tools/src/write-properties.c: Likewise.
* gettext-tools/src/write-qt.c: Likewise.
* gettext-tools/src/write-resources.c: Likewise.
* gettext-tools/src/write-tcl.c: Likewise.
* gettext-tools/src/write-xml.c: Likewise.
* gettext-tools/src/x-awk.c: Likewise.
* gettext-tools/src/x-c.c: Likewise.
* gettext-tools/src/x-csharp.c: Likewise.
* gettext-tools/src/x-desktop.c: Likewise.
* gettext-tools/src/x-elisp.c: Likewise.
* gettext-tools/src/x-java.c: Likewise.
* gettext-tools/src/x-javascript.c: Likewise.
* gettext-tools/src/x-librep.c: Likewise.
* gettext-tools/src/x-lisp.c: Likewise.
* gettext-tools/src/x-lua.c: Likewise.
* gettext-tools/src/x-perl.c: Likewise.
* gettext-tools/src/x-php.c: Likewise.
* gettext-tools/src/x-python.c: Likewise.
* gettext-tools/src/x-rst.c: Likewise.
* gettext-tools/src/x-ruby.c: Likewise.
* gettext-tools/src/x-scheme.c: Likewise.
* gettext-tools/src/x-sh.c: Likewise.
* gettext-tools/src/x-smalltalk.c: Likewise.
* gettext-tools/src/x-tcl.c: Likewise.
* gettext-tools/src/x-vala.c: Likewise.
* gettext-tools/src/x-ycp.c: Likewise.
* gettext-tools/src/xg-mixed-string.c: Likewise.
* gettext-tools/src/xgettext.c: Likewise.
* gettext-tools/tests/tstgettext.c: Likewise.
* gettext-tools/tests/tstngettext.c: Likewise.
* gnulib-local/lib/closeout.c: Likewise.
* gnulib-local/lib/xerror.c: Likewise.
* libtextstyle/gnulib-local/lib/fd-ostream.oo.c: Likewise.
* libtextstyle/gnulib-local/lib/html-styled-ostream.oo.c: Likewise.
* libtextstyle/gnulib-local/lib/iconv-ostream.oo.c: Likewise.
* libtextstyle/gnulib-local/lib/memory-ostream.oo.c: Likewise.
* libtextstyle/gnulib-local/lib/term-ostream.oo.c: Likewise.
* gettext-tools/src/its.c: Likewise, and reorganize #includes.
* gettext-tools/src/locating-rule.c: Likewise.

diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
index de3589c568d5a9dfc94227936af9f4e3498768cb..f9a20e6f8ad0cf2e4aef1ecdd9b9aa0ddcfbddb4 100644 (file)
--- a/gettext-runtime/src/envsubst.c
+++ b/gettext-runtime/src/envsubst.c
@@ -1,5 +1,5 @@
 /* Substitution of environment variables in shell format strings.
-   Copyright (C) 2003-2007, 2012, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,10 +28,10 @@
 #include <unistd.h>
 #include <locale.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename-lgpl.h"

diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c
index 0dd828ad67ee072b943a26c8c12d967b814dd05c..2cf76116be92d7b14eb589852a13b7269895b2e3 100644 (file)
--- a/gettext-runtime/src/gettext.c
+++ b/gettext-runtime/src/gettext.c
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2012, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <locale.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename-lgpl.h"

diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c
index 451f3588bd97bda6198591f8ba51f530a2810b4f..c6d28c6442eaad03a5b546c8b7915c01883c1ba8 100644 (file)
--- a/gettext-runtime/src/ngettext.c
+++ b/gettext-runtime/src/ngettext.c
@@ -1,5 +1,5 @@
 /* ngettext - retrieve plural form string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2012, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,10 +26,10 @@
 #include <locale.h>
 #include <errno.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename-lgpl.h"

diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c
index 7a14121985ce50922a0abdb937773575f216527a..ffcb11d159e8862a37d269f68304a1d77196244f 100644 (file)
--- a/gettext-tools/libgettextpo/gettext-po.c
+++ b/gettext-tools/libgettextpo/gettext-po.c
@@ -1,5 +1,5 @@
 /* Public API for GNU gettext PO files.
-   Copyright (C) 2003-2010, 2014, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #define _GL_NO_INLINE_ERROR
 
 /* Avoid side effect of config.h on 'struct po_error_handler'.  */
-#include "error.h"
+#include <error.h>
 static void (*orig_error) (int status, int errnum,
                            const char *format, ...)
   = error;

diff --git a/gettext-tools/libgrep/m-fgrep.c b/gettext-tools/libgrep/m-fgrep.c
index 6ae822f6a8416bc40392df3c7da5aba3519d477d..fd4cc5de53119e77dbeb2299d542283be7f59eff 100644 (file)
--- a/gettext-tools/libgrep/m-fgrep.c
+++ b/gettext-tools/libgrep/m-fgrep.c
@@ -1,5 +1,5 @@
 /* Pattern Matcher for Fixed String search.
-   Copyright (C) 1992, 1998, 2000, 2005-2006, 2010, 2013, 2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1992-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <wchar.h>
 
-#include "error.h"
+#include <error.h>
 #include "exitfail.h"
 #include "xalloc.h"
 #include "kwset.h"

diff --git a/gettext-tools/libgrep/m-regex.c b/gettext-tools/libgrep/m-regex.c
index 84b6fb874a47f704b8227e95621843af698b5a10..60e8955b65362082f45500addf1e49328c487a91 100644 (file)
--- a/gettext-tools/libgrep/m-regex.c
+++ b/gettext-tools/libgrep/m-regex.c
@@ -1,6 +1,5 @@
 /* Pattern Matchers for Regular Expressions.
-   Copyright (C) 1992, 1998, 2000, 2005-2006, 2010, 2013 Free Software
-   Foundation, Inc.
+   Copyright (C) 1992-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,7 +27,7 @@
 #include <string.h>
 #include <regex.h>
 
-#include "error.h"
+#include <error.h>
 #include "exitfail.h"
 #include "xalloc.h"
 

diff --git a/gettext-tools/src/file-list.c b/gettext-tools/src/file-list.c
index 3d2fcaf4dcbab41ae8dbcd03ba6140abdef528d9..ca9bf792cd5a2f705c6e385b002aaeddbfd8d0ea 100644 (file)
--- a/gettext-tools/src/file-list.c
+++ b/gettext-tools/src/file-list.c
@@ -1,5 +1,5 @@
 /* Reading file lists.
-   Copyright (C) 1995-1998, 2000-2002, 2007, 2019 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "str-list.h"
-#include "error.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */

diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c
index a8df14b904244f642a0583c08c450bab57acd4c7..6e1a5210792711848d0d230bf8245f7ead24b804 100644 (file)
--- a/gettext-tools/src/format-scheme.c
+++ b/gettext-tools/src/format-scheme.c
@@ -1,5 +1,5 @@
 /* Scheme format strings.
-   Copyright (C) 2001-2007, 2009, 2014, 2019, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,6 +22,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "format.h"
 #include "c-ctype.h"
@@ -30,7 +31,6 @@
 #include "xvasprintf.h"
 #include "format-invalid.h"
 #include "minmax.h"
-#include "error.h"
 #include "error-progname.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/format.h b/gettext-tools/src/format.h
index 50276dfd84c9ed84a88bc8beb06c835a96811460..b769af0ed37f524881e49140d33d0b29180093a1 100644 (file)
--- a/gettext-tools/src/format.h
+++ b/gettext-tools/src/format.h
@@ -1,5 +1,5 @@
 /* Format strings.
-   Copyright (C) 2001-2010, 2012-2013, 2015, 2019-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -21,10 +21,10 @@
 #include <stdbool.h>
 #include <stdlib.h>     /* because Gnulib's <stdlib.h> may '#define free ...' */
 
+#include <error.h>      /* Get fallback definition of __attribute__.  */
 #include "pos.h"        /* Get lex_pos_ty.  */
 #include "message.h"    /* Get NFORMATS.  */
 #include "plural-distrib.h" /* Get struct plural_distribution.  */
-#include "error.h"      /* Get fallback definition of __attribute__.  */
 
 
 #ifdef __cplusplus

diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index 32a8d32d4f99ea024b4304c3abab882f01d92767..c5622993dc5fba428c88213b86afc6c855185bf5 100644 (file)
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -1,5 +1,5 @@
 /* Display hostname in various forms.
-   Copyright (C) 2001-2003, 2006-2007, 2012, 2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -95,9 +95,9 @@
 /* Include this after <sys/socket.h>, to avoid a syntax error on BeOS.  */
 #include <stdbool.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/if-error.c b/gettext-tools/src/if-error.c
index 1e90f9e058e6a50827a4530d37f74c568e0d8de0..75c0a5a89ba9d7380abb1cac5befa4fe2ea78e04 100644 (file)
--- a/gettext-tools/src/if-error.c
+++ b/gettext-tools/src/if-error.c
@@ -1,5 +1,5 @@
 /* Error handling during reading of input files.
-   Copyright (C) 2023 Free Software Foundation, Inc.
+   Copyright (C) 2023-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include "error.h"
+#include <error.h>
 #include "xerror.h"
 #include "error-progname.h"
 #include "xalloc.h"

diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c
index e3e844ba33e87f3ff9a3025c9950d88cf947febc..36851217393d7654064f04f79f469dfdeaa10542 100644 (file)
--- a/gettext-tools/src/its.c
+++ b/gettext-tools/src/its.c
@@ -1,5 +1,5 @@
 /* Internationalization Tag Set (ITS) handling
-   Copyright (C) 2015, 2018-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2015-2024 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
@@ -25,19 +25,21 @@
 
 #include <assert.h>
 #include <errno.h>
-#include "error.h"
-#include "gettext.h"
-#include "mem-hash-map.h"
 #include <stdint.h>
+#include <stdlib.h>
+
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlwriter.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
-#include <stdlib.h>
+
+#include <error.h>
+#include "mem-hash-map.h"
 #include "trim.h"
 #include "xalloc.h"
 #include "xvasprintf.h"
+#include "gettext.h"
 
 #define _(str) gettext (str)
 

diff --git a/gettext-tools/src/locating-rule.c b/gettext-tools/src/locating-rule.c
index d6cf4184d4cab2edb4c0934be17df008620d33be..2ed5c48cf6ec453bb811e766ba7f18d98e29ad70 100644 (file)
--- a/gettext-tools/src/locating-rule.c
+++ b/gettext-tools/src/locating-rule.c
@@ -1,5 +1,5 @@
 /* XML resource locating rules
-   Copyright (C) 2015, 2019-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2015-2024 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
@@ -23,29 +23,29 @@
 /* Specification.  */
 #include "locating-rule.h"
 
-#include "basename-lgpl.h"
-#include "concat-filename.h"
-#include "c-strcase.h"
+#include <errno.h>
+#include <fnmatch.h>
 
 #if HAVE_DIRENT_H
 # include <dirent.h>
 #endif
-
 #if HAVE_DIRENT_H
 # define HAVE_DIR 1
 #else
 # define HAVE_DIR 0
 #endif
 
-#include "dir-list.h"
-#include <errno.h>
-#include "error.h"
-#include "filename.h"
-#include <fnmatch.h>
-#include "gettext.h"
 #include <libxml/parser.h>
 #include <libxml/uri.h>
+
+#include <error.h>
+#include "basename-lgpl.h"
+#include "concat-filename.h"
+#include "c-strcase.h"
+#include "dir-list.h"
+#include "filename.h"
 #include "xalloc.h"
+#include "gettext.h"
 
 #define _(str) gettext (str)
 

diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index 051afb1420b9b4ea2a945f950783fb66b8c4e129..88ea68de1c8ce9545e418806f9228bced70444c4 100644 (file)
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -1,5 +1,5 @@
 /* Manipulates attributes of messages in translation catalogs.
-   Copyright (C) 2001-2007, 2009-2010, 2012-2014, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,10 +28,10 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index f9b58463a7684bca1d36eb7e5a91fef6f4b33e8b..6554b8ce17fee92df6f16aea72be7fd346ce51cb 100644 (file)
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -1,5 +1,5 @@
 /* Concatenates several translation catalogs.
-   Copyright (C) 2001-2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,12 +28,12 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
 #include "str-list.h"
 #include "file-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index 17f6e4700755bb3b048f61c78604aaf9de4c1af4..e9bf6fc8b8807e47c43170f577b2373589d378ea 100644 (file)
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
    This program is free software: you can redistribute it and/or modify
@@ -26,10 +26,10 @@
 #include <stdlib.h>
 #include <locale.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index 48784873fb96734bbf6266ca9187975952e4545c..44287ad32b3b57a30ff0dba106c03235b7ad0d70 100644 (file)
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1997-1998, 2000-2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 1997-2024 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -28,12 +28,12 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
 #include "str-list.h"
 #include "file-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index e51312511d613c2e518b2ee9b24acb1efb80bfd0..fd1075e707d4edbfca339e4ade0977550a3d8e41 100644 (file)
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -1,5 +1,5 @@
 /* Converts a translation catalog to a different character encoding.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2014, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,10 +28,10 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index 31d34ca16f533940f1c4e5029852eb4c0824f336..6d975f1c8a8b7afb712812688abf9456a88ce68c 100644 (file)
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -1,5 +1,5 @@
 /* Creates an English translation catalog.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2014, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,10 +28,10 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index 070224b81f94860dc0c814e401a735ed8ff7e10a..47707b85539f733c388c7a727ed71b5fe3658886 100644 (file)
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -1,5 +1,5 @@
 /* Pass translations to a subprocess.
-   Copyright (C) 2001-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,10 +31,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "xvasprintf.h"
 #include "error-progname.h"
 #include "progname.h"

diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index 5fb66f123c2e72972067f3d8b8a12adc27b005c8..151ff8d14441ea7ee42e74a46ddfe1e3ecf07539 100644 (file)
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -1,5 +1,5 @@
 /* Edit translations using a subprocess.
-   Copyright (C) 2001-2010, 2012, 2014-2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -32,10 +32,10 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "xvasprintf.h"
 #include "error-progname.h"
 #include "progname.h"

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index a0eab229aaf5ae88dba96938072b454c11b4fc17..1ec51ac3762acd9d8ff058f483106d2a3016ba52 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -1,5 +1,5 @@
 /* Converts Uniforum style .po files to binary .mo files
-   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012, 2014-2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,11 +30,11 @@
 #include <sys/stat.h>
 #include <assert.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "str-list.h"
 #include "dir-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index 8a875b765a2dcdedfb387b28800c99bd5e4f0d58..4082863169802bebdda12ba3a608edd8bb3391f8 100644 (file)
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -1,5 +1,5 @@
 /* Extract some translations of a translation catalog.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2014, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -39,10 +39,10 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index c3856030051185c7f688d20724896a48428d7a34..206be5c37da8e4bd59de308e91d4c4fca1924926 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -1,5 +1,5 @@
 /* Initializes a new PO file.
-   Copyright (C) 2001-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -51,12 +51,13 @@
 
 #include <textstyle.h>
 
+#include <error.h>
+
 /* Get BINDIR.  */
 #include "configmake.h"
 
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c
index a7c7592a9e7d381143e5ea58d54ba7198c1e1616..a3bba5f53cad21fd6f0df7b2dae50e9311d4ec90 100644 (file)
--- a/gettext-tools/src/msgl-cat.c
+++ b/gettext-tools/src/msgl-cat.c
@@ -1,5 +1,5 @@
 /* Message list concatenation and duplicate handling.
-   Copyright (C) 2001-2003, 2005-2008, 2012, 2015, 2019-2021, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "xerror.h"
 #include "xvasprintf.h"
 #include "message.h"

diff --git a/gettext-tools/src/msgl-charset.c b/gettext-tools/src/msgl-charset.c
index 7e5c7f89692d5a2818d7cbbbe3e23ed46ae1a212..cbbe5b474934bcf37c8466daea38e90b252e101b 100644 (file)
--- a/gettext-tools/src/msgl-charset.c
+++ b/gettext-tools/src/msgl-charset.c
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,9 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "po-charset.h"
 #include "localcharset.h"
-#include "error.h"
 #include "progname.h"
 #include "basename-lgpl.h"
 #include "xmalloca.h"

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 9ed18df3e81c5bb04dd097c66a04373ba9383c5a..4980b2d820bc9aa7fa7868db075c03d86c1ed4d0 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012, 2014-2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
    This program is free software: you can redistribute it and/or modify
@@ -33,10 +33,10 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index e0ba3a74d827a9eb94f1f39e14f9e9c45d7767cf..80955b375770ec58c9ec88daf38d4d1a0704cbab 100644 (file)
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -1,5 +1,5 @@
 /* msgunfmt - converts binary .mo files to Uniforum style .po files
-   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,9 +28,9 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index 109e17627f1c816f8ff6d8cff23613e4c5aee6ca..cbb067c20f703ef21e0594efa02d028aaa286974 100644 (file)
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -1,5 +1,5 @@
 /* Remove, select or merge duplicate translations.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2014, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,11 +28,11 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
 #include "dir-list.h"
 #include "str-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/po-error.c b/gettext-tools/src/po-error.c
index 90ab578e1ed43d3a10b5a7aa9ff3cb6d3a3d4032..46ccae24365ea15fbe277dd5e6a221303c217cfb 100644 (file)
--- a/gettext-tools/src/po-error.c
+++ b/gettext-tools/src/po-error.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2004, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2004-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2004.
 
    This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 /* Specification.  */
 #include "po-error.h"
 
-#include "error.h"
+#include <error.h>
 #include "xerror.h"
 
 

diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y
index de52751e83dc2d3508f6e5ed8d24af30977d93ee..35a24d776ff7a1ef35ed25e62a435bdf5d409e34 100644 (file)
--- a/gettext-tools/src/po-gram-gen.y
+++ b/gettext-tools/src/po-gram-gen.y
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1996, 1998, 2000-2001, 2003, 2005-2006, 2012-2013, 2016, 2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
 
@@ -29,10 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "str-list.h"
 #include "po-lex.h"
 #include "po-charset.h"
-#include "error.h"
 #include "xalloc.h"
 #include "gettext.h"
 #include "read-catalog-abstract.h"

diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index 278016d16eab4d03e70acfe1caecad28ad1ff183..67d1dab098c6af0e1ef1bb3bd6a61d531d88e5b1 100644 (file)
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-2009, 2011, 2019, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>.
    Multibyte character handling by Bruno Haible <haible@clisp.cons.org>.
@@ -36,13 +36,13 @@
 # include <iconv.h>
 #endif
 
+#include <error.h>
 #include "attribute.h"
 #include "c-ctype.h"
 #include "uniwidth.h"
 #include "gettext.h"
 #include "po-charset.h"
 #include "xalloc.h"
-#include "error.h"
 #include "error-progname.h"
 #include "xvasprintf.h"
 #include "po-error.h"

diff --git a/gettext-tools/src/po-lex.h b/gettext-tools/src/po-lex.h
index dfdda15c11bf6f744b9b8773a9edead0572e2ac5..fdbeef0f5c617556afd57082b80b6c4de4febd8f 100644 (file)
--- a/gettext-tools/src/po-lex.h
+++ b/gettext-tools/src/po-lex.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2006, 2012, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -22,7 +22,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include "error.h"
+
+#include <error.h>
 #include "error-progname.h"
 #include "xerror.h"
 #include "pos.h"

diff --git a/gettext-tools/src/po-xerror.c b/gettext-tools/src/po-xerror.c
index d3ee367720a9f8a7054ea8dd69a3cfeb8c850208..a2a4f33e03cf782b8b63209d503be10df173d2d3 100644 (file)
--- a/gettext-tools/src/po-xerror.c
+++ b/gettext-tools/src/po-xerror.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2005-2007, 2013, 2019, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
@@ -23,15 +23,14 @@
 /* Specification.  */
 #include "po-xerror.h"
 
-#include <error.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "message.h"
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xerror.h"
-#include "error.h"
 #include "xvasprintf.h"
 #include "po-error.h"
 #if IN_LIBGETTEXTPO

diff --git a/gettext-tools/src/read-catalog-abstract.c b/gettext-tools/src/read-catalog-abstract.c
index c1956b29fab8ac2d55eef0e428513a70fab4c145..4e6901f12b34155a2d3e364ba40054967cd6b768 100644 (file)
--- a/gettext-tools/src/read-catalog-abstract.c
+++ b/gettext-tools/src/read-catalog-abstract.c
@@ -1,5 +1,5 @@
 /* Reading PO files, abstract class.
-   Copyright (C) 1995-1996, 1998, 2000-2009, 2013, 2015, 2021, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -29,11 +29,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "po-charset.h"
 #include "xalloc.h"
 #include "xvasprintf.h"
 #include "po-xerror.h"
-#include "error.h"
 #include "gettext.h"
 
 /* Local variables.  */

diff --git a/gettext-tools/src/read-csharp.c b/gettext-tools/src/read-csharp.c
index c6723a15cb6c3d0edc6f247ac5368d6e38a3bf80..4a4d70f49ff2b7d352876197d3450c3e59075850 100644 (file)
--- a/gettext-tools/src/read-csharp.c
+++ b/gettext-tools/src/read-csharp.c
@@ -1,5 +1,5 @@
 /* Reading C# satellite assemblies.
-   Copyright (C) 2003-2004, 2006-2008, 2010-2011, 2020 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <error.h>
 #include "msgunfmt.h"
 #include "relocatable.h"
 #include "csharpexec.h"
@@ -36,7 +37,6 @@
 #include "read-po.h"
 #include "xalloc.h"
 #include "concat-filename.h"
-#include "error.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/read-desktop.c b/gettext-tools/src/read-desktop.c
index a39ed01720297cd7fef62ed51154320d3130a1b8..f716d7815d7b39f62e17238b58b8950e0ef8e5b7 100644 (file)
--- a/gettext-tools/src/read-desktop.c
+++ b/gettext-tools/src/read-desktop.c
@@ -1,5 +1,5 @@
 /* Reading Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2019, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xvasprintf.h"

diff --git a/gettext-tools/src/read-java.c b/gettext-tools/src/read-java.c
index be2ce1634419a6010c62f921cb4af1e7654d5ea9..bf513fd52aefdbfd665f30e219ed9534d8c73e14 100644 (file)
--- a/gettext-tools/src/read-java.c
+++ b/gettext-tools/src/read-java.c
@@ -1,6 +1,5 @@
 /* Reading Java ResourceBundles.
-   Copyright (C) 2001-2003, 2006-2008, 2010-2011, 2017, 2019-2020 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,6 +27,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <error.h>
 #include "msgunfmt.h"
 #include "relocatable.h"
 #include "javaexec.h"
@@ -35,7 +35,6 @@
 #include "wait-process.h"
 #include "read-catalog.h"
 #include "read-po.h"
-#include "error.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/read-mo.c b/gettext-tools/src/read-mo.c
index affc6abb0e60586bba2883eb8d14c6b5af01bcaa..c55cec90a3c9da39e791f41a1f69f80a8cd9552c 100644 (file)
--- a/gettext-tools/src/read-mo.c
+++ b/gettext-tools/src/read-mo.c
@@ -1,5 +1,5 @@
 /* Reading binary .mo files.
-   Copyright (C) 1995-1998, 2000-2007, 2014-2015, 2017, 2020 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 #include "gmo.h"
 #include "hash-string.h"
 
-#include "error.h"
+#include <error.h>
 #include "xalloc.h"
 #include "binary-io.h"
 #include "message.h"

diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c
index 20518939a70b478974b749890e2941b19f48f790..b89f75b278009a405bd0e1d5e099119a0b974013 100644 (file)
--- a/gettext-tools/src/read-properties.c
+++ b/gettext-tools/src/read-properties.c
@@ -1,5 +1,5 @@
 /* Reading Java .properties files.
-   Copyright (C) 2003, 2005-2007, 2009, 2018, 2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "error-progname.h"
 #include "message.h"
 #include "read-catalog-abstract.h"

diff --git a/gettext-tools/src/read-resources.c b/gettext-tools/src/read-resources.c
index edb4763ad68a723cb56b63a00c38f29e9697159d..ee44a325d49db1b11b93dca514e529bb1f5839c1 100644 (file)
--- a/gettext-tools/src/read-resources.c
+++ b/gettext-tools/src/read-resources.c
@@ -1,5 +1,5 @@
 /* Reading C# .resources files.
-   Copyright (C) 2003-2004, 2006-2008, 2010-2011, 2020 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <error.h>
 #include "msgunfmt.h"
 #include "relocatable.h"
 #include "csharpexec.h"
@@ -36,7 +37,6 @@
 #include "read-po.h"
 #include "message.h"
 #include "concat-filename.h"
-#include "error.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/read-stringtable.c b/gettext-tools/src/read-stringtable.c
index 0b8b3f752c5d55ad5a34754bafc23b13b0f7d217..6df7d18e517978a49fd5ad5374dc6cfd2c15ee05 100644 (file)
--- a/gettext-tools/src/read-stringtable.c
+++ b/gettext-tools/src/read-stringtable.c
@@ -1,5 +1,5 @@
 /* Reading NeXTstep/GNUstep .strings files.
-   Copyright (C) 2003, 2005-2007, 2009, 2019-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
-#include "error.h"
 #include "error-progname.h"
 #include "read-catalog-abstract.h"
 #include "xalloc.h"

diff --git a/gettext-tools/src/read-tcl.c b/gettext-tools/src/read-tcl.c
index fce245e059ed506055a795b0336679822ffc8d18..3d6b93ac9c65872ead3107dc2deb3040b8e2e756 100644 (file)
--- a/gettext-tools/src/read-tcl.c
+++ b/gettext-tools/src/read-tcl.c
@@ -1,6 +1,5 @@
 /* Reading tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2005-2008, 2010-2011, 2018, 2020 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "msgunfmt.h"
 #include "relocatable.h"
 #include "concat-filename.h"
@@ -37,7 +37,6 @@
 #include "read-catalog.h"
 #include "read-po.h"
 #include "xmalloca.h"
-#include "error.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c
index c63ee54a8583b3391301b8736e5969ae52778299..d5989319f3d0a37884accad442d02e40b3515364 100644 (file)
--- a/gettext-tools/src/recode-sr-latin.c
+++ b/gettext-tools/src/recode-sr-latin.c
@@ -1,5 +1,5 @@
 /* Recode Serbian text from Cyrillic to Latin script.
-   Copyright (C) 2006-2007, 2010, 2012, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2006-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,9 +30,9 @@
 #include <iconv.h>
 #endif
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename-lgpl.h"

diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index 23fdb34589a7e499bb9eb566984a9f18dc2237bd..361f877ddcd6f5592ff1ffe9de6a3f15df8ef94c 100644 (file)
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -1,5 +1,5 @@
 /* Get the contents of an URL.
-   Copyright (C) 2001-2003, 2005-2010, 2012, 2017-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,9 +29,9 @@
 #include <locale.h>
 #include <unistd.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c
index 460ab8cd0fa9299557dbdee4cf4eef3a1157a728..c6415a6aee43bd4be3c4efc20b888e9277681fa5 100644 (file)
--- a/gettext-tools/src/write-csharp.c
+++ b/gettext-tools/src/write-csharp.c
@@ -1,5 +1,5 @@
 /* Writing C# satellite assemblies.
-   Copyright (C) 2003-2010, 2016, 2018-2020 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -70,10 +70,10 @@
 # define S_IXOTH (S_IXUSR >> 6)
 #endif
 
+#include <error.h>
 #include "attribute.h"
 #include "c-ctype.h"
 #include "relocatable.h"
-#include "error.h"
 #include "xerror.h"
 #include "csharpcomp.h"
 #include "message.h"

diff --git a/gettext-tools/src/write-desktop.c b/gettext-tools/src/write-desktop.c
index 9feadfd4e42981cc08df9a6fbc66c18a5f25626b..e63b8f516756f2e6dd9d476814823a261067494d 100644 (file)
--- a/gettext-tools/src/write-desktop.c
+++ b/gettext-tools/src/write-desktop.c
@@ -1,5 +1,5 @@
 /* Writing Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016, 2019-2020 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "error.h"
+
+#include <error.h>
 #include "msgl-iconv.h"
 #include "msgl-header.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index 1aa14550dfbb9419cb12bb05244b1de0b49f41ef..f13ef201f2d854bd9545b5fc9cd3fad1a16af127 100644 (file)
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -1,5 +1,5 @@
 /* Writing Java ResourceBundles.
-   Copyright (C) 2001-2003, 2005-2010, 2014, 2016, 2018-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -53,9 +53,9 @@
 # define S_IXUSR 00100
 #endif
 
+#include <error.h>
 #include "attribute.h"
 #include "c-ctype.h"
-#include "error.h"
 #include "xerror.h"
 #include "xvasprintf.h"
 #include "verify.h"

diff --git a/gettext-tools/src/write-mo.c b/gettext-tools/src/write-mo.c
index 06c7cff0a82836961206a88815919e476c00482c..964d66fc33338a0b0c6ffaa44d82a8d67ac8cae9 100644 (file)
--- a/gettext-tools/src/write-mo.c
+++ b/gettext-tools/src/write-mo.c
@@ -1,5 +1,5 @@
 /* Writing binary .mo files.
-   Copyright (C) 1995-1998, 2000-2007, 2016, 2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -37,8 +37,8 @@
 #include "gmo.h"
 #include "hash-string.h"
 
+#include <error.h>
 #include "byteswap.h"
-#include "error.h"
 #include "mem-hash-map.h"
 #include "message.h"
 #include "format.h"

diff --git a/gettext-tools/src/write-properties.c b/gettext-tools/src/write-properties.c
index 4da161efaf0986f4d25eaa1bf48e065725256edb..706a388ba3f6a30976d824553552f16ab53846d5 100644 (file)
--- a/gettext-tools/src/write-properties.c
+++ b/gettext-tools/src/write-properties.c
@@ -1,5 +1,5 @@
 /* Writing Java .properties files.
-   Copyright (C) 2003, 2005-2009, 2019, 2021 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 
 #include <textstyle.h>
 
-#include "error.h"
+#include <error.h>
 #include "message.h"
 #include "msgl-ascii.h"
 #include "msgl-iconv.h"

diff --git a/gettext-tools/src/write-qt.c b/gettext-tools/src/write-qt.c
index 73dea734acb77518b0160d85e80d960ecb9d7ea0..6b603b90a1a0fd1929dedd5c50e47f0ab4c004f4 100644 (file)
--- a/gettext-tools/src/write-qt.c
+++ b/gettext-tools/src/write-qt.c
@@ -1,5 +1,5 @@
 /* Writing Qt .qm files.
-   Copyright (C) 2003, 2005-2007, 2009, 2016, 2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
-#include "error.h"
 #include "xerror.h"
 #include "message.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/write-resources.c b/gettext-tools/src/write-resources.c
index 19cffd00459ed665f30962fc57a2af157b06b125..a6fc2b423cd59f56f4f2b38785dc91ece46eb7a5 100644 (file)
--- a/gettext-tools/src/write-resources.c
+++ b/gettext-tools/src/write-resources.c
@@ -1,6 +1,5 @@
 /* Writing C# .resources files.
-   Copyright (C) 2003-2005, 2007-2009, 2010-2011, 2016, 2020 Free Software
-   Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "xerror.h"
 #include "relocatable.h"
 #include "csharpexec.h"

diff --git a/gettext-tools/src/write-tcl.c b/gettext-tools/src/write-tcl.c
index 305da51b8e85aad621aa319c0f09a522267735f6..b771250d5fc4b5c87fe66453b8df3f0295be38e4 100644 (file)
--- a/gettext-tools/src/write-tcl.c
+++ b/gettext-tools/src/write-tcl.c
@@ -1,6 +1,5 @@
 /* Writing tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2005, 2007-2009, 2016 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "xerror.h"
 #include "message.h"
 #include "msgl-iconv.h"

diff --git a/gettext-tools/src/write-xml.c b/gettext-tools/src/write-xml.c
index 268e8fb8e491b89abc9211bc7ac417cf83855211..ae5f7c59a5e53644a828d2a9ae2dbaf4fbc49dfa 100644 (file)
--- a/gettext-tools/src/write-xml.c
+++ b/gettext-tools/src/write-xml.c
@@ -1,6 +1,5 @@
 /* Writing XML files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,7 +26,8 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "error.h"
+
+#include <error.h>
 #include "msgl-iconv.h"
 #include "msgl-header.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c
index 52165bfc577a1b0db3ff66797d9f8e210d2f1f98..f304ba2aa05b2f4f875caad488336d8e1b6185ba 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-2009, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "xgettext.h"
@@ -38,7 +39,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 13aaf81d1d00a0d788bdc35397efcac1179d74e8..d4fe6c4d18bb917756b7a0d327ab44fca2979e0e 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-2009, 2012-2015, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -41,7 +42,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "xvasprintf.h"

diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
index 47e53120ab0768077fc93b7222d13ce873fafd0c..42f299c4645396b974735cb1d524702ee04893a8 100644 (file)
--- a/gettext-tools/src/x-csharp.c
+++ b/gettext-tools/src/x-csharp.c
@@ -1,5 +1,5 @@
 /* xgettext C# backend.
-   Copyright (C) 2003-2009, 2011, 2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -40,7 +41,6 @@
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
 #include "c-ctype.h"
-#include "error.h"
 #include "if-error.h"
 #include "xstrerror.h"
 #include "xalloc.h"

diff --git a/gettext-tools/src/x-desktop.c b/gettext-tools/src/x-desktop.c
index 761c83cadd4ab8c3316b8eb78f1e3d06b148f7b0..6519ab5fee58a03e57d66c03ed766a9a3cdd71c7 100644 (file)
--- a/gettext-tools/src/x-desktop.c
+++ b/gettext-tools/src/x-desktop.c
@@ -1,5 +1,5 @@
 /* xgettext Desktop Entry backend.
-   Copyright (C) 2014, 2018-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2014-2024 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2014.
 
@@ -29,10 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "message.h"
 #include "xgettext.h"
 #include "xg-message.h"
-#include "error.h"
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xvasprintf.h"

diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c
index edf697a646ea29c7743b32c96b47f4aa89fb768c..354bbc8d7a9c96aa763c68f152f217b87e58d328 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-2009, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001-2002.
 
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "xgettext.h"
@@ -38,7 +39,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "mem-hash-map.h"

diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c
index 469c036c45f770d1f2c2533e464196bb1bc98bbd..4cf5e80478d9d5cb69ae856104120978a9df19b6 100644 (file)
--- a/gettext-tools/src/x-java.c
+++ b/gettext-tools/src/x-java.c
@@ -1,5 +1,5 @@
 /* xgettext Java backend.
-   Copyright (C) 2003, 2005-2009, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -39,7 +40,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "mem-hash-map.h"

diff --git a/gettext-tools/src/x-javascript.c b/gettext-tools/src/x-javascript.c
index c3ca0a82d10a901fc70afa1d13f4cd4a767f20b0..5f60c77c891beb32acc12f0c926a4517fcb05a2b 100644 (file)
--- a/gettext-tools/src/x-javascript.c
+++ b/gettext-tools/src/x-javascript.c
@@ -1,5 +1,5 @@
 /* xgettext JavaScript backend.
-   Copyright (C) 2002-2003, 2005-2009, 2013-2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
    This file was written by Andreas Stricker <andy@knitter.ch>, 2010
    It's based on x-python from Bruno Haible.
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -42,7 +43,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xstrerror.h"
 #include "progname.h"

diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c
index af7a44c0cd38d1d349c7ce7bca91ccce0362218c..967343917aadfd475969f94e6f501f92fb5801a5 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-2009, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "c-ctype.h"
 #include "message.h"
@@ -39,7 +40,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "mem-hash-map.h"

diff --git a/gettext-tools/src/x-lisp.c b/gettext-tools/src/x-lisp.c
index 420bd4c5061e28820db053960f400f9986ce275b..2209261ac32d990c1cf7c4adc119484ea4bb3b7f 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-2009, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "xgettext.h"
@@ -38,7 +39,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "mem-hash-map.h"

diff --git a/gettext-tools/src/x-lua.c b/gettext-tools/src/x-lua.c
index cff6c7016b70dc94a922a9a63caba5f4474b2a37..e7b52adfc4d939cd735015bb192a773ce45a9f54 100644 (file)
--- a/gettext-tools/src/x-lua.c
+++ b/gettext-tools/src/x-lua.c
@@ -1,5 +1,5 @@
 /* xgettext Lua backend.
-   Copyright (C) 2012-2013, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-2024 Free Software Foundation, Inc.
 
    This file was written by Ľubomír Remák <lubomirr@lubomirr.eu>, 2012.
 
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -38,7 +39,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index 194bf5ae9dcb07dbc94d84bf8c4004fb2840883f..ba50f772c1b260c9b2d8f470474c79b781536dd0 100644 (file)
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -1,5 +1,5 @@
 /* xgettext Perl backend.
-   Copyright (C) 2002-2010, 2013, 2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
    This file was written by Guido Flohr <guido@imperia.net>, 2002-2010.
 
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -41,7 +42,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "c-ctype.h"

diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index 09ba59352a23bd727b21fd48523039a9f1c38b44..b4f53a25e1fd99a02b69fd9779662f08b5ff085e 100644 (file)
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -1,5 +1,5 @@
 /* xgettext PHP backend.
-   Copyright (C) 2001-2003, 2005-2010, 2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -38,7 +39,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index 581b5549be269e7add9785377885c53ce9b3fc65..f1a157ec7c7b1071b0eb5f55628f534c0156aa8b 100644 (file)
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -1,5 +1,5 @@
 /* xgettext Python backend.
-   Copyright (C) 2002-2003, 2005-2011, 2013-2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -41,7 +42,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xstrerror.h"
 #include "progname.h"

diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
index 4502860c7d23d82d18c3bb376830b796fbead5f7..3e850797891a115b4fdd0aae3c94b990fff340cc 100644 (file)
--- a/gettext-tools/src/x-rst.c
+++ b/gettext-tools/src/x-rst.c
@@ -1,5 +1,5 @@
 /* xgettext RST/RSJ backend.
-   Copyright (C) 2001-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -29,6 +29,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "c-ctype.h"
 #include "po-charset.h"
 #include "message.h"
@@ -37,7 +38,6 @@
 #include "xg-encoding.h"
 #include "xg-mixed-string.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/x-ruby.c b/gettext-tools/src/x-ruby.c
index 115e5691f3108c9876b17e4473349f9d9a7a1deb..a8fc857a431e07479c901636485ad286d87845da 100644 (file)
--- a/gettext-tools/src/x-ruby.c
+++ b/gettext-tools/src/x-ruby.c
@@ -1,5 +1,5 @@
 /* xgettext Ruby backend.
-   Copyright (C) 2020 Free Software Foundation, Inc.
+   Copyright (C) 2020-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2020.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "message.h"
 #include "sh-quote.h"
 #include "spawn-pipe.h"
@@ -38,7 +39,6 @@
 #include "xg-message.h"
 #include "c-strstr.h"
 #include "read-catalog-abstract.h"
-#include "error.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */

diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c
index 0709ecb21028739fa78e7f4dafd85eb3f64898bb..5300d815bc58a7d5bf383352d0f71d05f33023fa 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-2009, 2011, 2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2004-2005.
 
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "xgettext.h"
@@ -38,7 +39,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "mem-hash-map.h"

diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c
index 28766108a87f421ba8deb8ee7a0d7380ede05087..154b185d756187f0d042d7f42b12edacb932e7e4 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-2009, 2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "xgettext.h"
@@ -38,7 +39,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "mem-hash-map.h"

diff --git a/gettext-tools/src/x-smalltalk.c b/gettext-tools/src/x-smalltalk.c
index 4b5a33facebe538688a45b028a9caa289c4931d1..055e59a895d5593a3388d52ccdca902f3856c319 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-2009, 2011, 2018-2020 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -27,12 +27,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "xgettext.h"
 #include "xg-pos.h"
 #include "xg-message.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 f79ff643e85cda579db7534bc8e556209d9c4b6c..40bfeea73404be63f5961da0896c28127772f240 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-2009, 2013, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "xgettext.h"
@@ -41,7 +42,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "mem-hash-map.h"

diff --git a/gettext-tools/src/x-vala.c b/gettext-tools/src/x-vala.c
index ac41aa2332f7099eb42f6953309cd0344d52a98c..38586838677031aad9222379419001959007f003 100644 (file)
--- a/gettext-tools/src/x-vala.c
+++ b/gettext-tools/src/x-vala.c
@@ -1,5 +1,5 @@
 /* xgettext Vala backend.
-   Copyright (C) 2013-2014, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2013-2024 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2013.
 
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -41,7 +42,6 @@
 #include "xg-arglist-callshape.h"
 #include "xg-arglist-parser.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "xvasprintf.h"

diff --git a/gettext-tools/src/x-ycp.c b/gettext-tools/src/x-ycp.c
index 203b6b24ed393182a78cc5812a7a6e39f4babc8a..d55400c2ce2789da87c2c0d906a4f6be24797a93 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-2009, 2011, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "message.h"
 #include "rc-str-list.h"
@@ -36,7 +37,6 @@
 #include "xg-pos.h"
 #include "xg-arglist-context.h"
 #include "xg-message.h"
-#include "error.h"
 #include "if-error.h"
 #include "xalloc.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/xg-mixed-string.c b/gettext-tools/src/xg-mixed-string.c
index 4c0d64447278a4d2c3f120ae007ab8bb0d5fa2e9..a2ce938e11f62ca358e5d008329d1b9b81e26d7d 100644 (file)
--- a/gettext-tools/src/xg-mixed-string.c
+++ b/gettext-tools/src/xg-mixed-string.c
@@ -1,6 +1,6 @@
 /* Handling strings that are given partially in the source encoding and
    partially in Unicode.
-   Copyright (C) 2001-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "if-error.h"
 #include "flexmember.h"
 #include "msgl-ascii.h"

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 1a97bb43839f8ef8a4dfd65d48581f3345a1ee76..bbecfab46b7a1d0aca5468a437228c2b1df62571 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -1,5 +1,5 @@
 /* Extracts strings from C source file to Uniforum style .po file.
-   Copyright (C) 1995-1998, 2000-2016, 2018-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -41,6 +41,7 @@
 
 #include <textstyle.h>
 
+#include <error.h>
 #include "noreturn.h"
 #include "rc-str-list.h"
 #include "xg-encoding.h"
@@ -51,7 +52,6 @@
 #include "dir-list.h"
 #include "file-list.h"
 #include "str-list.h"
-#include "error.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c
index 2b96e2a37c728b48780a9b3eaf0d8e8315b0fd07..a90980eff7cbb21c1804fc26450bca9d09e19714 100644 (file)
--- a/gettext-tools/tests/tstgettext.c
+++ b/gettext-tools/tests/tstgettext.c
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <locale.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename-lgpl.h"

diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c
index 614d1ccd2db0783392728c0aab10627679b30a1a..c2d0304a54f68218d80b1280fbf691abd162309c 100644 (file)
--- a/gettext-tools/tests/tstngettext.c
+++ b/gettext-tools/tests/tstngettext.c
@@ -1,5 +1,5 @@
 /* ngettext - retrieve plural form strings from message catalog and print them.
-   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,10 +26,10 @@
 #include <locale.h>
 #include <errno.h>
 
+#include <error.h>
 #include "attribute.h"
 #include "noreturn.h"
 #include "closeout.h"
-#include "error.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename-lgpl.h"

diff --git a/gnulib-local/lib/closeout.c b/gnulib-local/lib/closeout.c
index 2a930d6eaad2067383bf795fdab92e0c1bf7912b..aab415507a85d1764b1c170682a73df4910db858 100644 (file)
--- a/gnulib-local/lib/closeout.c
+++ b/gnulib-local/lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1998-2024 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "error.h"
+#include <error.h>
 #include "fwriteerror.h"
 #include "gettext.h"
 

diff --git a/gnulib-local/lib/xerror.c b/gnulib-local/lib/xerror.c
index c43aa449533a7a0cdfaa9900d841bb09c06a53ab..d10c005ae62b2ddc9a6cf3d60131ac34e5a18264 100644 (file)
--- a/gnulib-local/lib/xerror.c
+++ b/gnulib-local/lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2019, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "error-progname.h"
 #include "mbswidth.h"
 #if IN_LIBGETTEXTPO

diff --git a/libtextstyle/gnulib-local/lib/fd-ostream.oo.c b/libtextstyle/gnulib-local/lib/fd-ostream.oo.c
index 3bf0c2070eea684b5e8855f2a3d1a2f2050a6a4a..7d418ec6725a83d9464b0df874c7249bd6c5c4b8 100644 (file)
--- a/libtextstyle/gnulib-local/lib/fd-ostream.oo.c
+++ b/libtextstyle/gnulib-local/lib/fd-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006-2007, 2019-2020 Free Software Foundation, Inc.
+   Copyright (C) 2006-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 # include <termios.h>
 #endif
 
-#include "error.h"
+#include <error.h>
 #include "full-write.h"
 #include "xalloc.h"
 #include "gettext.h"

diff --git a/libtextstyle/gnulib-local/lib/html-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/html-styled-ostream.oo.c
index 562fc5661ba38bb2a6f47d31133478234168905f..9a965082874f652926f52330725e29605036c08c 100644 (file)
--- a/libtextstyle/gnulib-local/lib/html-styled-ostream.oo.c
+++ b/libtextstyle/gnulib-local/lib/html-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006-2007, 2019-2020 Free Software Foundation, Inc.
+   Copyright (C) 2006-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 # define O_TEXT 0
 #endif
 
-#include "error.h"
+#include <error.h>
 #include "safe-read.h"
 #include "xalloc.h"
 #include "gettext.h"

diff --git a/libtextstyle/gnulib-local/lib/iconv-ostream.oo.c b/libtextstyle/gnulib-local/lib/iconv-ostream.oo.c
index d815f95dcb7f60d503206c56c813dd16e981a414..9c6e02a9fa3aa0826a2252d557b8abb53ac1c315 100644 (file)
--- a/libtextstyle/gnulib-local/lib/iconv-ostream.oo.c
+++ b/libtextstyle/gnulib-local/lib/iconv-ostream.oo.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <error.h>
 #include "c-strcase.h"
-#include "error.h"
 #include "xalloc.h"
 #include "gettext.h"
 

diff --git a/libtextstyle/gnulib-local/lib/memory-ostream.oo.c b/libtextstyle/gnulib-local/lib/memory-ostream.oo.c
index 46a0d895d9992cf6fcaf866cbdc9ba06087275d3..be57fb997806d2d9835ecaf44c3912caac4860e4 100644 (file)
--- a/libtextstyle/gnulib-local/lib/memory-ostream.oo.c
+++ b/libtextstyle/gnulib-local/lib/memory-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that accumulates the output in memory.
-   Copyright (C) 2006-2007, 2019-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2006-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
+#include <error.h>
 #include "xalloc.h"
 #include "xsize.h"
 #include "gettext.h"

diff --git a/libtextstyle/gnulib-local/lib/term-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-ostream.oo.c
index 096058cc38bb6819dd3b070936047f3ba0f4124d..1dd1a273f32ba70de14fd83fb9aba8e03f323f29 100644 (file)
--- a/libtextstyle/gnulib-local/lib/term-ostream.oo.c
+++ b/libtextstyle/gnulib-local/lib/term-ostream.oo.c
@@ -36,7 +36,7 @@
 # include <windows.h>
 #endif
 
-#include "error.h"
+#include <error.h>
 #include "full-write.h"
 #include "get_ppid_of.h"
 #include "get_progname_of.h"