From 057cf901ba815a33585184fa59e03f89100d458f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 10 Aug 2025 17:34:20 +0200 Subject: [PATCH] Use standard way of including . * gettext-runtime/src/*.c: Include unconditionally. * gettext-runtime/libasprintf/lib-asprintf.h: Likewise. * libtextstyle/lib/color.c: Likewise. * gnulib-local/lib/markup.c: Likewise. * gettext-tools/src/*.y: Likewise. * gettext-tools/src/*.c: Likewise. * gettext-tools/libgrep/*.c: Likewise. * gettext-tools/libgettextpo/*.c: Likewise. * gettext-tools/tests/*.c: Likewise. --- gettext-runtime/libasprintf/lib-asprintf.h | 6 ++---- gettext-runtime/src/envsubst.c | 4 +--- gettext-runtime/src/gettext.c | 4 +--- gettext-runtime/src/ngettext.c | 4 +--- gettext-runtime/src/printf_gettext.c | 4 +--- gettext-runtime/src/printf_ngettext.c | 4 +--- gettext-tools/libgettextpo/gettext-po.c | 6 ++---- gettext-tools/libgrep/m-fgrep.c | 4 +--- gettext-tools/libgrep/m-regex.c | 4 +--- gettext-tools/src/cldr-plural-exp.c | 6 ++---- gettext-tools/src/cldr-plural.y | 4 +--- gettext-tools/src/cldr-plurals.c | 4 +--- gettext-tools/src/dir-list.c | 6 ++---- gettext-tools/src/file-list.c | 6 ++---- gettext-tools/src/filter-quote.c | 6 ++---- gettext-tools/src/filter-sr-latin.c | 6 ++---- gettext-tools/src/format-awk.c | 6 ++---- gettext-tools/src/format-boost.c | 6 ++---- gettext-tools/src/format-c++-brace.c | 6 ++---- gettext-tools/src/format-c.c | 6 ++---- gettext-tools/src/format-csharp.c | 6 ++---- gettext-tools/src/format-d.c | 6 ++---- gettext-tools/src/format-elisp.c | 6 ++---- gettext-tools/src/format-gcc-internal.c | 6 ++---- gettext-tools/src/format-gfc-internal.c | 6 ++---- gettext-tools/src/format-go.c | 6 ++---- gettext-tools/src/format-java-printf.c | 6 ++---- gettext-tools/src/format-java.c | 6 ++---- gettext-tools/src/format-javascript.c | 6 ++---- gettext-tools/src/format-kde-kuit.c | 6 ++---- gettext-tools/src/format-kde.c | 6 ++---- gettext-tools/src/format-librep.c | 6 ++---- gettext-tools/src/format-lisp.c | 6 ++---- gettext-tools/src/format-lua.c | 4 +--- gettext-tools/src/format-modula2.c | 6 ++---- gettext-tools/src/format-ocaml.c | 6 ++---- gettext-tools/src/format-pascal.c | 6 ++---- gettext-tools/src/format-perl-brace.c | 6 ++---- gettext-tools/src/format-perl.c | 6 ++---- gettext-tools/src/format-php.c | 6 ++---- gettext-tools/src/format-python-brace.c | 6 ++---- gettext-tools/src/format-python.c | 6 ++---- gettext-tools/src/format-qt-plural.c | 6 ++---- gettext-tools/src/format-qt.c | 6 ++---- gettext-tools/src/format-ruby.c | 6 ++---- gettext-tools/src/format-rust.c | 6 ++---- gettext-tools/src/format-scheme.c | 6 ++---- gettext-tools/src/format-sh-printf.c | 6 ++---- gettext-tools/src/format-sh.c | 6 ++---- gettext-tools/src/format-smalltalk.c | 6 ++---- gettext-tools/src/format-tcl.c | 6 ++---- gettext-tools/src/format.c | 4 +--- gettext-tools/src/hostname.c | 4 +--- gettext-tools/src/if-error.c | 4 +--- gettext-tools/src/its.c | 2 -- gettext-tools/src/lang-table.c | 6 ++---- gettext-tools/src/locating-rules.c | 6 ++---- gettext-tools/src/message.c | 4 +--- gettext-tools/src/msgattrib.c | 4 +--- gettext-tools/src/msgcat.c | 4 +--- gettext-tools/src/msgcmp.c | 4 +--- gettext-tools/src/msgcomm.c | 4 +--- gettext-tools/src/msgconv.c | 4 +--- gettext-tools/src/msgen.c | 4 +--- gettext-tools/src/msgexec.c | 4 +--- gettext-tools/src/msgfilter.c | 4 +--- gettext-tools/src/msgfmt.c | 4 +--- gettext-tools/src/msggrep.c | 4 +--- gettext-tools/src/msginit.c | 4 +--- gettext-tools/src/msgl-ascii.c | 4 +--- gettext-tools/src/msgl-cat.c | 4 +--- gettext-tools/src/msgl-charset.c | 6 ++---- gettext-tools/src/msgl-check.c | 4 +--- gettext-tools/src/msgl-english.c | 6 ++---- gettext-tools/src/msgl-equal.c | 6 ++---- gettext-tools/src/msgl-fsearch.c | 6 ++---- gettext-tools/src/msgl-header.c | 6 ++---- gettext-tools/src/msgl-iconv.c | 4 +--- gettext-tools/src/msgl-ofn.c | 6 ++---- gettext-tools/src/msgmerge.c | 4 +--- gettext-tools/src/msgunfmt.c | 4 +--- gettext-tools/src/msguniq.c | 4 +--- gettext-tools/src/open-catalog.c | 6 ++---- gettext-tools/src/plural-count.c | 6 ++---- gettext-tools/src/plural-eval.c | 6 ++---- gettext-tools/src/plural-table.c | 6 ++---- gettext-tools/src/po-charset.c | 6 ++---- gettext-tools/src/po-error.c | 6 ++---- gettext-tools/src/po-time.c | 6 ++---- gettext-tools/src/pos.c | 6 ++---- gettext-tools/src/read-catalog-abstract.c | 4 +--- gettext-tools/src/read-catalog-file.c | 6 ++---- gettext-tools/src/read-catalog-special.c | 4 +--- gettext-tools/src/read-catalog.c | 4 +--- gettext-tools/src/read-csharp.c | 4 +--- gettext-tools/src/read-desktop.c | 4 +--- gettext-tools/src/read-java.c | 6 ++---- gettext-tools/src/read-mo.c | 6 ++---- gettext-tools/src/read-po-gram.y | 6 ++---- gettext-tools/src/read-po-lex.c | 6 ++---- gettext-tools/src/read-po.c | 6 ++---- gettext-tools/src/read-properties.c | 4 +--- gettext-tools/src/read-resources.c | 6 ++---- gettext-tools/src/read-stringtable.c | 4 +--- gettext-tools/src/read-tcl.c | 6 ++---- gettext-tools/src/recode-sr-latin.c | 4 +--- gettext-tools/src/search-path.c | 6 ++---- gettext-tools/src/sentence.c | 6 ++---- gettext-tools/src/str-list.c | 6 ++---- gettext-tools/src/urlget.c | 4 +--- gettext-tools/src/write-catalog.c | 6 ++---- gettext-tools/src/write-csharp.c | 4 +--- gettext-tools/src/write-desktop.c | 6 ++---- gettext-tools/src/write-java.c | 4 +--- gettext-tools/src/write-mo.c | 4 +--- gettext-tools/src/write-po.c | 6 ++---- gettext-tools/src/write-properties.c | 6 ++---- gettext-tools/src/write-qt.c | 4 +--- gettext-tools/src/write-resources.c | 6 ++---- gettext-tools/src/write-stringtable.c | 6 ++---- gettext-tools/src/write-tcl.c | 6 ++---- gettext-tools/src/write-xml.c | 6 ++---- gettext-tools/src/x-awk.c | 4 +--- gettext-tools/src/x-c.c | 4 +--- gettext-tools/src/x-csharp.c | 4 +--- gettext-tools/src/x-d.c | 4 +--- gettext-tools/src/x-desktop.c | 6 ++---- gettext-tools/src/x-elisp.c | 6 ++---- gettext-tools/src/x-go.c | 4 +--- gettext-tools/src/x-java.c | 4 +--- gettext-tools/src/x-javascript.c | 4 +--- gettext-tools/src/x-librep.c | 6 ++---- gettext-tools/src/x-lisp.c | 6 ++---- gettext-tools/src/x-lua.c | 4 +--- gettext-tools/src/x-modula2.c | 4 +--- gettext-tools/src/x-ocaml.c | 4 +--- gettext-tools/src/x-perl.c | 4 +--- gettext-tools/src/x-php.c | 4 +--- gettext-tools/src/x-po.c | 6 ++---- gettext-tools/src/x-python.c | 4 +--- gettext-tools/src/x-rst.c | 4 +--- gettext-tools/src/x-ruby.c | 6 ++---- gettext-tools/src/x-rust.c | 4 +--- gettext-tools/src/x-scheme.c | 4 +--- gettext-tools/src/x-sh.c | 4 +--- gettext-tools/src/x-smalltalk.c | 4 +--- gettext-tools/src/x-tcl.c | 6 ++---- gettext-tools/src/x-typescript.c | 4 +--- gettext-tools/src/x-typescriptx.c | 4 +--- gettext-tools/src/x-vala.c | 4 +--- gettext-tools/src/x-ycp.c | 4 +--- gettext-tools/src/xerror-handler.c | 6 ++---- gettext-tools/src/xg-arglist-callshape.c | 6 ++---- gettext-tools/src/xg-arglist-context.c | 6 ++---- gettext-tools/src/xg-arglist-parser.c | 6 ++---- gettext-tools/src/xg-check.c | 4 +--- gettext-tools/src/xg-encoding.c | 4 +--- gettext-tools/src/xg-formatstring.c | 6 ++---- gettext-tools/src/xg-message.c | 4 +--- gettext-tools/src/xg-mixed-string.c | 4 +--- gettext-tools/src/xg-pos.c | 6 ++---- gettext-tools/src/xgettext.c | 4 +--- gettext-tools/tests/format-c-3-prg.c | 6 ++---- gettext-tools/tests/format-c-4-prg.c | 6 ++---- gettext-tools/tests/format-c-5-prg.c | 6 ++---- gettext-tools/tests/gettextpo-1-prg.c | 6 ++---- gettext-tools/tests/intl-1-prg.c | 6 ++---- gettext-tools/tests/intl-3-prg.c | 6 ++---- gettext-tools/tests/intl-4-prg.c | 6 ++---- gettext-tools/tests/intl-5-prg.c | 6 ++---- gettext-tools/tests/intl-6-prg.c | 6 ++---- gettext-tools/tests/intl-7-prg.c | 6 ++---- gettext-tools/tests/intl-setlocale-1-prg.c | 6 ++---- gettext-tools/tests/intl-setlocale-2-prg.c | 6 ++---- gettext-tools/tests/intl-thread-1-prg.c | 6 ++---- gettext-tools/tests/intl-thread-2-prg.c | 6 ++---- gettext-tools/tests/intl-thread-3-prg.c | 6 ++---- gettext-tools/tests/intl-version-prg.c | 6 ++---- gettext-tools/tests/plural-1-prg.c | 6 ++---- gettext-tools/tests/sentence-1-prg.c | 4 +--- gettext-tools/tests/setlocale.c | 6 ++---- gettext-tools/tests/testlocale.c | 6 ++---- gettext-tools/tests/tstgettext.c | 4 +--- gettext-tools/tests/tstngettext.c | 4 +--- gnulib-local/lib/markup.c | 2 +- libtextstyle/lib/color.c | 6 ++---- 186 files changed, 294 insertions(+), 664 deletions(-) diff --git a/gettext-runtime/libasprintf/lib-asprintf.h b/gettext-runtime/libasprintf/lib-asprintf.h index 1ad8b90f7..920ee14c0 100644 --- a/gettext-runtime/libasprintf/lib-asprintf.h +++ b/gettext-runtime/libasprintf/lib-asprintf.h @@ -1,5 +1,5 @@ /* Library functions for class autosprintf. - Copyright (C) 2002-2003, 2018 Free Software Foundation, Inc. + Copyright (C) 2002-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #if HAVE_VASPRINTF && HAVE_POSIX_PRINTF diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c index 26201e899..541e51749 100644 --- a/gettext-runtime/src/envsubst.c +++ b/gettext-runtime/src/envsubst.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c index 6dfa78569..3409d095b 100644 --- a/gettext-runtime/src/gettext.c +++ b/gettext-runtime/src/gettext.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c index 2f7fe644a..2d7b104c3 100644 --- a/gettext-runtime/src/ngettext.c +++ b/gettext-runtime/src/ngettext.c @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-runtime/src/printf_gettext.c b/gettext-runtime/src/printf_gettext.c index 3ef0a8977..e054c0285 100644 --- a/gettext-runtime/src/printf_gettext.c +++ b/gettext-runtime/src/printf_gettext.c @@ -22,9 +22,7 @@ variables TEXTDOMAIN and TEXTDOMAINDIR), and applies that translated format string to the arguments. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-runtime/src/printf_ngettext.c b/gettext-runtime/src/printf_ngettext.c index b8a2efe50..30ae3e329 100644 --- a/gettext-runtime/src/printf_ngettext.c +++ b/gettext-runtime/src/printf_ngettext.c @@ -25,9 +25,7 @@ the language of the message catalog where the translation was found, and applies that translated format string to the arguments. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c index 7de2f1864..94384dd2f 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 2003-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gettext-po.h" diff --git a/gettext-tools/libgrep/m-fgrep.c b/gettext-tools/libgrep/m-fgrep.c index ab90330d4..85f481dc9 100644 --- a/gettext-tools/libgrep/m-fgrep.c +++ b/gettext-tools/libgrep/m-fgrep.c @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "libgrep.h" diff --git a/gettext-tools/libgrep/m-regex.c b/gettext-tools/libgrep/m-regex.c index 37719f42f..27b273c07 100644 --- a/gettext-tools/libgrep/m-regex.c +++ b/gettext-tools/libgrep/m-regex.c @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "libgrep.h" diff --git a/gettext-tools/src/cldr-plural-exp.c b/gettext-tools/src/cldr-plural-exp.c index ba211d7d6..0c8a9a270 100644 --- a/gettext-tools/src/cldr-plural-exp.c +++ b/gettext-tools/src/cldr-plural-exp.c @@ -1,5 +1,5 @@ /* Unicode CLDR plural rule parser and converter. - Copyright (C) 2015-2024 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno , 2015. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/src/cldr-plural.y b/gettext-tools/src/cldr-plural.y index a5bc4e8a0..2c14e4ed9 100644 --- a/gettext-tools/src/cldr-plural.y +++ b/gettext-tools/src/cldr-plural.y @@ -17,9 +17,7 @@ along with this program. If not, see . */ %{ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/src/cldr-plurals.c b/gettext-tools/src/cldr-plurals.c index 03f02224d..7c3868515 100644 --- a/gettext-tools/src/cldr-plurals.c +++ b/gettext-tools/src/cldr-plurals.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "basename-lgpl.h" #include "cldr-plural-exp.h" diff --git a/gettext-tools/src/dir-list.c b/gettext-tools/src/dir-list.c index c409e72ee..f9d675c76 100644 --- a/gettext-tools/src/dir-list.c +++ b/gettext-tools/src/dir-list.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1996, 1998, 2000-2002, 2006 Free Software Foundation, Inc. + Copyright (C) 1996-2025 Free Software Foundation, Inc. This file was written by Peter Miller @@ -17,9 +17,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* Specification. */ #include "dir-list.h" diff --git a/gettext-tools/src/file-list.c b/gettext-tools/src/file-list.c index ca9bf792c..44fc475d9 100644 --- a/gettext-tools/src/file-list.c +++ b/gettext-tools/src/file-list.c @@ -1,5 +1,5 @@ /* Reading file lists. - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "file-list.h" diff --git a/gettext-tools/src/filter-quote.c b/gettext-tools/src/filter-quote.c index f6571c4af..e0f7b167d 100644 --- a/gettext-tools/src/filter-quote.c +++ b/gettext-tools/src/filter-quote.c @@ -1,5 +1,5 @@ /* Convert ASCII quotations to Unicode quotations. - Copyright (C) 2014-2016 Free Software Foundation, Inc. + Copyright (C) 2014-2025 Free Software Foundation, Inc. Written by Daiki Ueno , 2014. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "filters.h" diff --git a/gettext-tools/src/filter-sr-latin.c b/gettext-tools/src/filter-sr-latin.c index cc783cfee..fdb98c302 100644 --- a/gettext-tools/src/filter-sr-latin.c +++ b/gettext-tools/src/filter-sr-latin.c @@ -1,5 +1,5 @@ /* Recode Serbian text from Cyrillic to Latin script. - Copyright (C) 2006-2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2006-2025 Free Software Foundation, Inc. Written by Danilo Å egan , 2006, and Bruno Haible , 2006. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "filters.h" diff --git a/gettext-tools/src/format-awk.c b/gettext-tools/src/format-awk.c index adba4aca2..3ca648bb4 100644 --- a/gettext-tools/src/format-awk.c +++ b/gettext-tools/src/format-awk.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -675,7 +673,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-awk.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-awk.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-boost.c b/gettext-tools/src/format-boost.c index c8ca49883..314a45de5 100644 --- a/gettext-tools/src/format-boost.c +++ b/gettext-tools/src/format-boost.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -785,7 +783,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-boost.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-boost.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-c++-brace.c b/gettext-tools/src/format-c++-brace.c index 681f4930a..5c59be038 100644 --- a/gettext-tools/src/format-c++-brace.c +++ b/gettext-tools/src/format-c++-brace.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -1100,7 +1098,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-c++-brace.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-c++-brace.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c index 1529dddb6..0ce64306f 100644 --- a/gettext-tools/src/format-c.c +++ b/gettext-tools/src/format-c.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -374,7 +372,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-c.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-c.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-csharp.c b/gettext-tools/src/format-csharp.c index 68d4cf479..4bcb741f0 100644 --- a/gettext-tools/src/format-csharp.c +++ b/gettext-tools/src/format-csharp.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -284,7 +282,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-csharp.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-csharp.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-d.c b/gettext-tools/src/format-d.c index 75d2eff47..599f99370 100644 --- a/gettext-tools/src/format-d.c +++ b/gettext-tools/src/format-d.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -2437,7 +2435,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-d.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-d.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-elisp.c b/gettext-tools/src/format-elisp.c index 237b7e9ac..a9d236314 100644 --- a/gettext-tools/src/format-elisp.c +++ b/gettext-tools/src/format-elisp.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -513,7 +511,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-elisp.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-elisp.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-gcc-internal.c b/gettext-tools/src/format-gcc-internal.c index 303b396b9..74d53441a 100644 --- a/gettext-tools/src/format-gcc-internal.c +++ b/gettext-tools/src/format-gcc-internal.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -1073,7 +1071,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-gcc-internal.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-gcc-internal.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-gfc-internal.c b/gettext-tools/src/format-gfc-internal.c index 420e16061..fc44ecf66 100644 --- a/gettext-tools/src/format-gfc-internal.c +++ b/gettext-tools/src/format-gfc-internal.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -498,7 +496,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-gfc-internal.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-gfc-internal.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-go.c b/gettext-tools/src/format-go.c index 4d1ef5d07..8644506ae 100644 --- a/gettext-tools/src/format-go.c +++ b/gettext-tools/src/format-go.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -739,7 +737,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-go.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-go.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-java-printf.c b/gettext-tools/src/format-java-printf.c index de2e5fe97..4a32a9a9b 100644 --- a/gettext-tools/src/format-java-printf.c +++ b/gettext-tools/src/format-java-printf.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -708,7 +706,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-java-printf.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-java-printf.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-java.c b/gettext-tools/src/format-java.c index 022306dc0..9ed457cfa 100644 --- a/gettext-tools/src/format-java.c +++ b/gettext-tools/src/format-java.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -890,7 +888,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-java.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-java.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-javascript.c b/gettext-tools/src/format-javascript.c index 25348df3e..5652091dd 100644 --- a/gettext-tools/src/format-javascript.c +++ b/gettext-tools/src/format-javascript.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -530,7 +528,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-javascript.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-javascript.c ../gnulib-lib/libgettextlib.la" * End: */ #endif /* TEST */ diff --git a/gettext-tools/src/format-kde-kuit.c b/gettext-tools/src/format-kde-kuit.c index 784042466..8a39dc334 100644 --- a/gettext-tools/src/format-kde-kuit.c +++ b/gettext-tools/src/format-kde-kuit.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -427,7 +425,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -I/usr/include/libxml2 -DHAVE_CONFIG_H -DTEST_KUIT format-kde-kuit.c format-kde.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -I/usr/include/libxml2 -DTEST_KUIT format-kde-kuit.c format-kde.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-kde.c b/gettext-tools/src/format-kde.c index 267b2fc87..a46d7a95a 100644 --- a/gettext-tools/src/format-kde.c +++ b/gettext-tools/src/format-kde.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -346,7 +344,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-kde.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-kde.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-librep.c b/gettext-tools/src/format-librep.c index 3ea286dfc..54afac586 100644 --- a/gettext-tools/src/format-librep.c +++ b/gettext-tools/src/format-librep.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -474,7 +472,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-librep.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-librep.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c index b12c7083f..b17793fd8 100644 --- a/gettext-tools/src/format-lisp.c +++ b/gettext-tools/src/format-lisp.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -3669,7 +3667,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-lisp.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-lisp.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-lua.c b/gettext-tools/src/format-lua.c index 4bab92d1a..5edfdd7fb 100644 --- a/gettext-tools/src/format-lua.c +++ b/gettext-tools/src/format-lua.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include @@ -356,7 +354,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-lua.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-lua.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-modula2.c b/gettext-tools/src/format-modula2.c index 3f3ea4052..ca74abbb5 100644 --- a/gettext-tools/src/format-modula2.c +++ b/gettext-tools/src/format-modula2.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -326,7 +324,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-modula2.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-modula2.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-ocaml.c b/gettext-tools/src/format-ocaml.c index acd0b6dd5..cec56fd07 100644 --- a/gettext-tools/src/format-ocaml.c +++ b/gettext-tools/src/format-ocaml.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -1093,7 +1091,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-ocaml.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-ocaml.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-pascal.c b/gettext-tools/src/format-pascal.c index c9c8c3434..f6e83259e 100644 --- a/gettext-tools/src/format-pascal.c +++ b/gettext-tools/src/format-pascal.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -534,7 +532,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-pascal.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-pascal.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-perl-brace.c b/gettext-tools/src/format-perl-brace.c index 355509ecc..fa4916594 100644 --- a/gettext-tools/src/format-perl-brace.c +++ b/gettext-tools/src/format-perl-brace.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -288,7 +286,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-perl-brace.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-perl-brace.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-perl.c b/gettext-tools/src/format-perl.c index f55a929e8..2816d11c0 100644 --- a/gettext-tools/src/format-perl.c +++ b/gettext-tools/src/format-perl.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -779,7 +777,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-perl.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-perl.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-php.c b/gettext-tools/src/format-php.c index 1e132594c..9a577ff9c 100644 --- a/gettext-tools/src/format-php.c +++ b/gettext-tools/src/format-php.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -517,7 +515,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-php.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-php.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-python-brace.c b/gettext-tools/src/format-python-brace.c index 0d5aee2b3..ddb543d44 100644 --- a/gettext-tools/src/format-python-brace.c +++ b/gettext-tools/src/format-python-brace.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -651,7 +649,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-python-brace.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-python-brace.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-python.c b/gettext-tools/src/format-python.c index 41ce96b3e..4dab1a9d3 100644 --- a/gettext-tools/src/format-python.c +++ b/gettext-tools/src/format-python.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -715,7 +713,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-python.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-python.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-qt-plural.c b/gettext-tools/src/format-qt-plural.c index d056a3f8d..eb994f141 100644 --- a/gettext-tools/src/format-qt-plural.c +++ b/gettext-tools/src/format-qt-plural.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -188,7 +186,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-qt-plural.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-qt-plural.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-qt.c b/gettext-tools/src/format-qt.c index e8c907694..deb013894 100644 --- a/gettext-tools/src/format-qt.c +++ b/gettext-tools/src/format-qt.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -262,7 +260,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-qt.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-qt.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-ruby.c b/gettext-tools/src/format-ruby.c index 017e3e365..1e11dcb75 100644 --- a/gettext-tools/src/format-ruby.c +++ b/gettext-tools/src/format-ruby.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -1131,7 +1129,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-ruby.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-ruby.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-rust.c b/gettext-tools/src/format-rust.c index f579a8bc7..29e16cc84 100644 --- a/gettext-tools/src/format-rust.c +++ b/gettext-tools/src/format-rust.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -636,7 +634,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-rust.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-rust.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c index 0cef3a103..aae4db3e4 100644 --- a/gettext-tools/src/format-scheme.c +++ b/gettext-tools/src/format-scheme.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -3591,7 +3589,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-scheme.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-scheme.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-sh-printf.c b/gettext-tools/src/format-sh-printf.c index d2fb87ce2..72156b9a5 100644 --- a/gettext-tools/src/format-sh-printf.c +++ b/gettext-tools/src/format-sh-printf.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -627,7 +625,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-sh-printf.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-sh-printf.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-sh.c b/gettext-tools/src/format-sh.c index abd932b46..8c395508e 100644 --- a/gettext-tools/src/format-sh.c +++ b/gettext-tools/src/format-sh.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -398,7 +396,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-sh.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-sh.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-smalltalk.c b/gettext-tools/src/format-smalltalk.c index c56c537a4..6ec84a53d 100644 --- a/gettext-tools/src/format-smalltalk.c +++ b/gettext-tools/src/format-smalltalk.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -245,7 +243,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-smalltalk.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-smalltalk.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format-tcl.c b/gettext-tools/src/format-tcl.c index 3e985dab4..77ae630f7 100644 --- a/gettext-tools/src/format-tcl.c +++ b/gettext-tools/src/format-tcl.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include @@ -563,7 +561,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-tcl.c ../gnulib-lib/libgettextlib.la" + * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DTEST format-tcl.c ../gnulib-lib/libgettextlib.la" * End: */ diff --git a/gettext-tools/src/format.c b/gettext-tools/src/format.c index 928938684..bf3d74ebc 100644 --- a/gettext-tools/src/format.c +++ b/gettext-tools/src/format.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "format.h" diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c index c2faf3da6..5bc22bfa4 100644 --- a/gettext-tools/src/hostname.c +++ b/gettext-tools/src/hostname.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/if-error.c b/gettext-tools/src/if-error.c index de0e52390..54d05b06e 100644 --- a/gettext-tools/src/if-error.c +++ b/gettext-tools/src/if-error.c @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2023. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "if-error.h" diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c index d2cecb31d..cbe400e52 100644 --- a/gettext-tools/src/its.c +++ b/gettext-tools/src/its.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include -#endif /* Specification. */ #include "its.h" diff --git a/gettext-tools/src/lang-table.c b/gettext-tools/src/lang-table.c index 53ea8d7ab..c34e556e1 100644 --- a/gettext-tools/src/lang-table.c +++ b/gettext-tools/src/lang-table.c @@ -1,5 +1,5 @@ /* Table of languages. - Copyright (C) 2001-2009 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "lang-table.h" diff --git a/gettext-tools/src/locating-rules.c b/gettext-tools/src/locating-rules.c index 72efb331f..689845395 100644 --- a/gettext-tools/src/locating-rules.c +++ b/gettext-tools/src/locating-rules.c @@ -1,5 +1,5 @@ /* XML resource locating rules - Copyright (C) 2015-2024 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno , 2015. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "locating-rules.h" diff --git a/gettext-tools/src/message.c b/gettext-tools/src/message.c index 6db1e1809..bc2885e5e 100644 --- a/gettext-tools/src/message.c +++ b/gettext-tools/src/message.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "message.h" diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c index 0556af694..c416b0ded 100644 --- a/gettext-tools/src/msgattrib.c +++ b/gettext-tools/src/msgattrib.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c index de5b2aa7d..9a7dfb447 100644 --- a/gettext-tools/src/msgcat.c +++ b/gettext-tools/src/msgcat.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c index f42061cf2..e20e7a1c4 100644 --- a/gettext-tools/src/msgcmp.c +++ b/gettext-tools/src/msgcmp.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c index 666d34611..9f709b481 100644 --- a/gettext-tools/src/msgcomm.c +++ b/gettext-tools/src/msgcomm.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c index f47a83c32..52c128043 100644 --- a/gettext-tools/src/msgconv.c +++ b/gettext-tools/src/msgconv.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c index 9fc6a3650..bf23ecc30 100644 --- a/gettext-tools/src/msgen.c +++ b/gettext-tools/src/msgen.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index bc52c4234..7e49859b6 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c index f7dfbb6d8..3f0880983 100644 --- a/gettext-tools/src/msgfilter.c +++ b/gettext-tools/src/msgfilter.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c index 863276e6f..f7c45a7f3 100644 --- a/gettext-tools/src/msgfmt.c +++ b/gettext-tools/src/msgfmt.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c index 94054dcd3..c127d8582 100644 --- a/gettext-tools/src/msggrep.c +++ b/gettext-tools/src/msggrep.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 2ff31e634..482b110f0 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/msgl-ascii.c b/gettext-tools/src/msgl-ascii.c index 9b21d047c..3a769d362 100644 --- a/gettext-tools/src/msgl-ascii.c +++ b/gettext-tools/src/msgl-ascii.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "msgl-ascii.h" diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c index a477285eb..7f9c903df 100644 --- a/gettext-tools/src/msgl-cat.c +++ b/gettext-tools/src/msgl-cat.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/msgl-charset.c b/gettext-tools/src/msgl-charset.c index 63aa19a0a..070edee7a 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c index 46471cc56..fc743eee1 100644 --- a/gettext-tools/src/msgl-check.c +++ b/gettext-tools/src/msgl-check.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "msgl-check.h" diff --git a/gettext-tools/src/msgl-english.c b/gettext-tools/src/msgl-english.c index 5392e1d22..f7a8c6228 100644 --- a/gettext-tools/src/msgl-english.c +++ b/gettext-tools/src/msgl-english.c @@ -1,5 +1,5 @@ /* Message translation initialization for English. - Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "msgl-english.h" diff --git a/gettext-tools/src/msgl-equal.c b/gettext-tools/src/msgl-equal.c index 97fe6aa04..1b9ac8d47 100644 --- a/gettext-tools/src/msgl-equal.c +++ b/gettext-tools/src/msgl-equal.c @@ -1,5 +1,5 @@ /* Message list test for equality. - Copyright (C) 2001-2002, 2005-2006, 2008 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "msgl-equal.h" diff --git a/gettext-tools/src/msgl-fsearch.c b/gettext-tools/src/msgl-fsearch.c index c9ba623f0..f36a43b20 100644 --- a/gettext-tools/src/msgl-fsearch.c +++ b/gettext-tools/src/msgl-fsearch.c @@ -1,5 +1,5 @@ /* Fast fuzzy searching among messages. - Copyright (C) 2006-2024 Free Software Foundation, Inc. + Copyright (C) 2006-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2006. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "msgl-fsearch.h" diff --git a/gettext-tools/src/msgl-header.c b/gettext-tools/src/msgl-header.c index 0e3637533..8240c8d32 100644 --- a/gettext-tools/src/msgl-header.c +++ b/gettext-tools/src/msgl-header.c @@ -1,5 +1,5 @@ /* Message list header manipulation. - Copyright (C) 2007-2024 Free Software Foundation, Inc. + Copyright (C) 2007-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "msgl-header.h" diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c index eaa36fe16..3175e776e 100644 --- a/gettext-tools/src/msgl-iconv.c +++ b/gettext-tools/src/msgl-iconv.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/msgl-ofn.c b/gettext-tools/src/msgl-ofn.c index 88efe7d0e..c23bf66a0 100644 --- a/gettext-tools/src/msgl-ofn.c +++ b/gettext-tools/src/msgl-ofn.c @@ -1,5 +1,5 @@ /* Message list test for ordinary file names. - Copyright (C) 2021-2024 Free Software Foundation, Inc. + Copyright (C) 2021-2025 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 @@ -17,9 +17,7 @@ /* Written by Bruno Haible , 2021. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "msgl-ofn.h" diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index dacd31949..6ebc528be 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c index 3777dcd91..093e85589 100644 --- a/gettext-tools/src/msgunfmt.c +++ b/gettext-tools/src/msgunfmt.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c index 38be7b8c0..6c01075d8 100644 --- a/gettext-tools/src/msguniq.c +++ b/gettext-tools/src/msguniq.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/open-catalog.c b/gettext-tools/src/open-catalog.c index b904886ff..b90558355 100644 --- a/gettext-tools/src/open-catalog.c +++ b/gettext-tools/src/open-catalog.c @@ -1,5 +1,5 @@ /* open-po - search for .po file along search path list and open for reading - Copyright (C) 1995-1996, 2000-2003, 2005-2009, 2020 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. Written by Ulrich Drepper , April 1995. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "open-catalog.h" diff --git a/gettext-tools/src/plural-count.c b/gettext-tools/src/plural-count.c index a4d6ac70c..8058f9605 100644 --- a/gettext-tools/src/plural-count.c +++ b/gettext-tools/src/plural-count.c @@ -1,5 +1,5 @@ /* Plural form count. - Copyright (C) 2003, 2007 Free Software Foundation, Inc. + Copyright (C) 2003-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "plural-count.h" diff --git a/gettext-tools/src/plural-eval.c b/gettext-tools/src/plural-eval.c index dac9a845f..d7f2bc242 100644 --- a/gettext-tools/src/plural-eval.c +++ b/gettext-tools/src/plural-eval.c @@ -1,5 +1,5 @@ /* Expression evaluation for plural form selection. - Copyright (C) 2000-2023 Free Software Foundation, Inc. + Copyright (C) 2000-2025 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "plural-eval.h" diff --git a/gettext-tools/src/plural-table.c b/gettext-tools/src/plural-table.c index 81438516c..be87373a0 100644 --- a/gettext-tools/src/plural-table.c +++ b/gettext-tools/src/plural-table.c @@ -1,5 +1,5 @@ /* Table of known plural form expressions. - Copyright (C) 2001-2006, 2009-2010, 2022 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "plural-table.h" diff --git a/gettext-tools/src/po-charset.c b/gettext-tools/src/po-charset.c index 58aa680bc..1a0dad883 100644 --- a/gettext-tools/src/po-charset.c +++ b/gettext-tools/src/po-charset.c @@ -1,5 +1,5 @@ /* Charset handling while reading PO files. - Copyright (C) 2001-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/po-error.c b/gettext-tools/src/po-error.c index 46ccae243..349c0b79e 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 2004-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2004. This program is free software: you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Avoid side effect of gnulib's error.h. */ #define _GL_NO_INLINE_ERROR diff --git a/gettext-tools/src/po-time.c b/gettext-tools/src/po-time.c index 74001cb79..a3dfd5b33 100644 --- a/gettext-tools/src/po-time.c +++ b/gettext-tools/src/po-time.c @@ -1,5 +1,5 @@ /* PO/POT file timestamps. - Copyright (C) 1995-1998, 2000-2003, 2006 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. Written by Ulrich Drepper , April 1995. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "po-time.h" diff --git a/gettext-tools/src/pos.c b/gettext-tools/src/pos.c index ffa1bd3bf..91001f206 100644 --- a/gettext-tools/src/pos.c +++ b/gettext-tools/src/pos.c @@ -1,5 +1,5 @@ /* Source file positions. - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "pos.h" diff --git a/gettext-tools/src/read-catalog-abstract.c b/gettext-tools/src/read-catalog-abstract.c index 754d6db52..f0c6dce5a 100644 --- a/gettext-tools/src/read-catalog-abstract.c +++ b/gettext-tools/src/read-catalog-abstract.c @@ -17,9 +17,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "read-catalog-abstract.h" diff --git a/gettext-tools/src/read-catalog-file.c b/gettext-tools/src/read-catalog-file.c index 6567c8588..ba9c25876 100644 --- a/gettext-tools/src/read-catalog-file.c +++ b/gettext-tools/src/read-catalog-file.c @@ -1,5 +1,5 @@ /* Reading PO files. - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Peter Miller This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-catalog-file.h" diff --git a/gettext-tools/src/read-catalog-special.c b/gettext-tools/src/read-catalog-special.c index 47bbc05b1..91d19fba0 100644 --- a/gettext-tools/src/read-catalog-special.c +++ b/gettext-tools/src/read-catalog-special.c @@ -17,9 +17,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "read-catalog-special.h" diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c index 8f3e67b69..d71cae93b 100644 --- a/gettext-tools/src/read-catalog.c +++ b/gettext-tools/src/read-catalog.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-catalog.h" diff --git a/gettext-tools/src/read-csharp.c b/gettext-tools/src/read-csharp.c index de6602346..bfd6fa62f 100644 --- a/gettext-tools/src/read-csharp.c +++ b/gettext-tools/src/read-csharp.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-csharp.h" diff --git a/gettext-tools/src/read-desktop.c b/gettext-tools/src/read-desktop.c index 27ebd0e19..161db07a2 100644 --- a/gettext-tools/src/read-desktop.c +++ b/gettext-tools/src/read-desktop.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-desktop.h" diff --git a/gettext-tools/src/read-java.c b/gettext-tools/src/read-java.c index c9da864d7..d8b25d8cb 100644 --- a/gettext-tools/src/read-java.c +++ b/gettext-tools/src/read-java.c @@ -1,5 +1,5 @@ /* Reading Java ResourceBundles. - Copyright (C) 2001-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-java.h" diff --git a/gettext-tools/src/read-mo.c b/gettext-tools/src/read-mo.c index c55cec90a..bcad4170e 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. Written by Ulrich Drepper , April 1995. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-mo.h" diff --git a/gettext-tools/src/read-po-gram.y b/gettext-tools/src/read-po-gram.y index 1d16f308c..6a13f93ec 100644 --- a/gettext-tools/src/read-po-gram.y +++ b/gettext-tools/src/read-po-gram.y @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Peter Miller @@ -17,9 +17,7 @@ along with this program. If not, see . */ %{ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "read-po-internal.h" diff --git a/gettext-tools/src/read-po-lex.c b/gettext-tools/src/read-po-lex.c index 893ef0288..d5550636c 100644 --- a/gettext-tools/src/read-po-lex.c +++ b/gettext-tools/src/read-po-lex.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Peter Miller . Multibyte character handling by Bruno Haible . @@ -18,9 +18,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "read-po-lex.h" diff --git a/gettext-tools/src/read-po.c b/gettext-tools/src/read-po.c index f817be9f7..e954ef6ea 100644 --- a/gettext-tools/src/read-po.c +++ b/gettext-tools/src/read-po.c @@ -1,5 +1,5 @@ /* Reading PO files. - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-po.h" diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c index 91f5c9fb8..b8c7fc150 100644 --- a/gettext-tools/src/read-properties.c +++ b/gettext-tools/src/read-properties.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-properties.h" diff --git a/gettext-tools/src/read-resources.c b/gettext-tools/src/read-resources.c index 0e72d5029..7bb9889e1 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 2003-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-resources.h" diff --git a/gettext-tools/src/read-stringtable.c b/gettext-tools/src/read-stringtable.c index a22afd9d6..5394ef1ca 100644 --- a/gettext-tools/src/read-stringtable.c +++ b/gettext-tools/src/read-stringtable.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "read-stringtable.h" diff --git a/gettext-tools/src/read-tcl.c b/gettext-tools/src/read-tcl.c index 7fc5aeee9..332279727 100644 --- a/gettext-tools/src/read-tcl.c +++ b/gettext-tools/src/read-tcl.c @@ -1,5 +1,5 @@ /* Reading tcl/msgcat .msg files. - Copyright (C) 2002-2024 Free Software Foundation, Inc. + Copyright (C) 2002-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c index 0ff4162b4..7d105801f 100644 --- a/gettext-tools/src/recode-sr-latin.c +++ b/gettext-tools/src/recode-sr-latin.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/search-path.c b/gettext-tools/src/search-path.c index eed4f112d..1e062025f 100644 --- a/gettext-tools/src/search-path.c +++ b/gettext-tools/src/search-path.c @@ -1,5 +1,5 @@ /* Routines for locating data files - Copyright (C) 2016-2024 Free Software Foundation, Inc. + Copyright (C) 2016-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno , 2016. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "search-path.h" diff --git a/gettext-tools/src/sentence.c b/gettext-tools/src/sentence.c index 313b5dd6d..9764968d6 100644 --- a/gettext-tools/src/sentence.c +++ b/gettext-tools/src/sentence.c @@ -1,5 +1,5 @@ /* Sentence handling. - Copyright (C) 2015 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. Written by Daiki Ueno , 2015. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "sentence.h" diff --git a/gettext-tools/src/str-list.c b/gettext-tools/src/str-list.c index afe36d596..910f0a900 100644 --- a/gettext-tools/src/str-list.c +++ b/gettext-tools/src/str-list.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Peter Miller @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "str-list.h" diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index 16941294d..723125be1 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -16,9 +16,7 @@ along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/src/write-catalog.c b/gettext-tools/src/write-catalog.c index 2b755e137..8f9cfcd98 100644 --- a/gettext-tools/src/write-catalog.c +++ b/gettext-tools/src/write-catalog.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "write-catalog.h" diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c index c0250eadf..312662dc9 100644 --- a/gettext-tools/src/write-csharp.c +++ b/gettext-tools/src/write-csharp.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/write-desktop.c b/gettext-tools/src/write-desktop.c index 0c8f02eca..440b44ba8 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno . This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "write-desktop.h" diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c index 6b22c4c51..9feffbc5e 100644 --- a/gettext-tools/src/write-java.c +++ b/gettext-tools/src/write-java.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/write-mo.c b/gettext-tools/src/write-mo.c index 281c1d788..245372f01 100644 --- a/gettext-tools/src/write-mo.c +++ b/gettext-tools/src/write-mo.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c index c50fff73e..b2b2a6d30 100644 --- a/gettext-tools/src/write-po.c +++ b/gettext-tools/src/write-po.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Peter Miller @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/write-properties.c b/gettext-tools/src/write-properties.c index 43eb40fc2..16cfdab71 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 2003-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "write-properties.h" diff --git a/gettext-tools/src/write-qt.c b/gettext-tools/src/write-qt.c index 706525196..1fc68ea95 100644 --- a/gettext-tools/src/write-qt.c +++ b/gettext-tools/src/write-qt.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "write-qt.h" diff --git a/gettext-tools/src/write-resources.c b/gettext-tools/src/write-resources.c index 903ff4d9b..bc11b2954 100644 --- a/gettext-tools/src/write-resources.c +++ b/gettext-tools/src/write-resources.c @@ -1,5 +1,5 @@ /* Writing C# .resources files. - Copyright (C) 2003-2024 Free Software Foundation, Inc. + Copyright (C) 2003-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "write-resources.h" diff --git a/gettext-tools/src/write-stringtable.c b/gettext-tools/src/write-stringtable.c index cfe59da6b..bdce20138 100644 --- a/gettext-tools/src/write-stringtable.c +++ b/gettext-tools/src/write-stringtable.c @@ -1,5 +1,5 @@ /* Writing NeXTstep/GNUstep .strings files. - Copyright (C) 2003-2024 Free Software Foundation, Inc. + Copyright (C) 2003-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "write-stringtable.h" diff --git a/gettext-tools/src/write-tcl.c b/gettext-tools/src/write-tcl.c index f5e49b8a4..831fb9ed9 100644 --- a/gettext-tools/src/write-tcl.c +++ b/gettext-tools/src/write-tcl.c @@ -1,5 +1,5 @@ /* Writing tcl/msgcat .msg files. - Copyright (C) 2002-2024 Free Software Foundation, Inc. + Copyright (C) 2002-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/src/write-xml.c b/gettext-tools/src/write-xml.c index 948594123..fe7660c2d 100644 --- a/gettext-tools/src/write-xml.c +++ b/gettext-tools/src/write-xml.c @@ -1,5 +1,5 @@ /* Writing XML files. - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno . This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "write-xml.h" diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c index 1a98290c8..098b69031 100644 --- a/gettext-tools/src/x-awk.c +++ b/gettext-tools/src/x-awk.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-awk.h" diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c index 9b53e8fc8..c0bf3a29e 100644 --- a/gettext-tools/src/x-c.c +++ b/gettext-tools/src/x-c.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-c.h" diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c index 0b3af4880..df7d0a9f8 100644 --- a/gettext-tools/src/x-csharp.c +++ b/gettext-tools/src/x-csharp.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-csharp.h" diff --git a/gettext-tools/src/x-d.c b/gettext-tools/src/x-d.c index f151495f6..8d6ce0164 100644 --- a/gettext-tools/src/x-d.c +++ b/gettext-tools/src/x-d.c @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2025. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-d.h" diff --git a/gettext-tools/src/x-desktop.c b/gettext-tools/src/x-desktop.c index 4f36dd027..1d1da1c7c 100644 --- 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-2024 Free Software Foundation, Inc. + Copyright (C) 2014-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno , 2014. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-desktop.h" diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c index 354bbc8d7..ade3908f4 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-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. This file was written by Bruno Haible , 2001-2002. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-elisp.h" diff --git a/gettext-tools/src/x-go.c b/gettext-tools/src/x-go.c index e4241a3d8..5bebfe185 100644 --- a/gettext-tools/src/x-go.c +++ b/gettext-tools/src/x-go.c @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2025. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-go.h" diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c index f82d62254..31864ed79 100644 --- a/gettext-tools/src/x-java.c +++ b/gettext-tools/src/x-java.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-java.h" diff --git a/gettext-tools/src/x-javascript.c b/gettext-tools/src/x-javascript.c index f77e01f01..c6fe3e913 100644 --- a/gettext-tools/src/x-javascript.c +++ b/gettext-tools/src/x-javascript.c @@ -17,9 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-javascript.h" diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c index 967343917..5fb6734f1 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-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. This file was written by Bruno Haible , 2001. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-librep.h" diff --git a/gettext-tools/src/x-lisp.c b/gettext-tools/src/x-lisp.c index 2209261ac..8ed6a5385 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-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. This file was written by Bruno Haible , 2001. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-lisp.h" diff --git a/gettext-tools/src/x-lua.c b/gettext-tools/src/x-lua.c index aa2a492b8..8b04264e7 100644 --- a/gettext-tools/src/x-lua.c +++ b/gettext-tools/src/x-lua.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* Specification. */ #include "x-lua.h" diff --git a/gettext-tools/src/x-modula2.c b/gettext-tools/src/x-modula2.c index a5b805466..5cc3c4087 100644 --- a/gettext-tools/src/x-modula2.c +++ b/gettext-tools/src/x-modula2.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-modula2.h" diff --git a/gettext-tools/src/x-ocaml.c b/gettext-tools/src/x-ocaml.c index 5151b7e89..d7755d1fc 100644 --- a/gettext-tools/src/x-ocaml.c +++ b/gettext-tools/src/x-ocaml.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-ocaml.h" diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c index f9a603d92..4bcbc9923 100644 --- a/gettext-tools/src/x-perl.c +++ b/gettext-tools/src/x-perl.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-perl.h" diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c index 762993a6c..f79f59417 100644 --- a/gettext-tools/src/x-php.c +++ b/gettext-tools/src/x-php.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-php.h" diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c index 521921583..7d826d269 100644 --- a/gettext-tools/src/x-po.c +++ b/gettext-tools/src/x-po.c @@ -1,5 +1,5 @@ /* xgettext PO, JavaProperties, and NXStringTable backends. - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Peter Miller @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "x-po.h" diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c index e1787f288..6bcb98485 100644 --- a/gettext-tools/src/x-python.c +++ b/gettext-tools/src/x-python.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-python.h" diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c index def179ffa..2245aa342 100644 --- a/gettext-tools/src/x-rst.c +++ b/gettext-tools/src/x-rst.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-rst.h" diff --git a/gettext-tools/src/x-ruby.c b/gettext-tools/src/x-ruby.c index 7fadc4d04..765d2c347 100644 --- a/gettext-tools/src/x-ruby.c +++ b/gettext-tools/src/x-ruby.c @@ -1,5 +1,5 @@ /* xgettext Ruby backend. - Copyright (C) 2020-2024 Free Software Foundation, Inc. + Copyright (C) 2020-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2020. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-ruby.h" diff --git a/gettext-tools/src/x-rust.c b/gettext-tools/src/x-rust.c index 87c78e3d1..8561e4c17 100644 --- a/gettext-tools/src/x-rust.c +++ b/gettext-tools/src/x-rust.c @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2025. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-rust.h" diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c index e73ec8a84..3f952fb85 100644 --- a/gettext-tools/src/x-scheme.c +++ b/gettext-tools/src/x-scheme.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-scheme.h" diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c index 6cdc18e0b..4e29b9196 100644 --- a/gettext-tools/src/x-sh.c +++ b/gettext-tools/src/x-sh.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-sh.h" diff --git a/gettext-tools/src/x-smalltalk.c b/gettext-tools/src/x-smalltalk.c index 5b3a3fa8b..f818d693d 100644 --- a/gettext-tools/src/x-smalltalk.c +++ b/gettext-tools/src/x-smalltalk.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-smalltalk.h" diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c index 40bfeea73..c9ba45c8b 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-2024 Free Software Foundation, Inc. + Copyright (C) 2002-2025 Free Software Foundation, Inc. This file was written by Bruno Haible , 2002. @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-tcl.h" diff --git a/gettext-tools/src/x-typescript.c b/gettext-tools/src/x-typescript.c index d15bb2fab..47cc6db24 100644 --- a/gettext-tools/src/x-typescript.c +++ b/gettext-tools/src/x-typescript.c @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2025. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-typescript.h" diff --git a/gettext-tools/src/x-typescriptx.c b/gettext-tools/src/x-typescriptx.c index 9b8139933..7cdc13498 100644 --- a/gettext-tools/src/x-typescriptx.c +++ b/gettext-tools/src/x-typescriptx.c @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2025. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-typescriptx.h" diff --git a/gettext-tools/src/x-vala.c b/gettext-tools/src/x-vala.c index be97b6772..9228c900c 100644 --- a/gettext-tools/src/x-vala.c +++ b/gettext-tools/src/x-vala.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-vala.h" diff --git a/gettext-tools/src/x-ycp.c b/gettext-tools/src/x-ycp.c index 6ef2749dd..fec7b19c5 100644 --- a/gettext-tools/src/x-ycp.c +++ b/gettext-tools/src/x-ycp.c @@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "x-ycp.h" diff --git a/gettext-tools/src/xerror-handler.c b/gettext-tools/src/xerror-handler.c index 5423fefa7..a163c146d 100644 --- a/gettext-tools/src/xerror-handler.c +++ b/gettext-tools/src/xerror-handler.c @@ -1,5 +1,5 @@ /* Error handling during reading and writing of textual message catalogs. - Copyright (C) 2005-2024 Free Software Foundation, Inc. + Copyright (C) 2005-2025 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 @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2024. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "xerror-handler.h" diff --git a/gettext-tools/src/xg-arglist-callshape.c b/gettext-tools/src/xg-arglist-callshape.c index 06b70760b..7536baf69 100644 --- a/gettext-tools/src/xg-arglist-callshape.c +++ b/gettext-tools/src/xg-arglist-callshape.c @@ -1,6 +1,6 @@ /* Resolving ambiguity of argument lists: Information given through command-line options. - Copyright (C) 2001-2018 Free Software Foundation, Inc. + Copyright (C) 2001-2025 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 @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-arglist-callshape.h" diff --git a/gettext-tools/src/xg-arglist-context.c b/gettext-tools/src/xg-arglist-context.c index 5153f7b60..76d0e096a 100644 --- a/gettext-tools/src/xg-arglist-context.c +++ b/gettext-tools/src/xg-arglist-context.c @@ -1,6 +1,6 @@ /* Keeping track of the flags that apply to a string extracted in a certain context. - Copyright (C) 2001-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 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 @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-arglist-context.h" diff --git a/gettext-tools/src/xg-arglist-parser.c b/gettext-tools/src/xg-arglist-parser.c index b5cb67a0d..0ccb33136 100644 --- a/gettext-tools/src/xg-arglist-parser.c +++ b/gettext-tools/src/xg-arglist-parser.c @@ -1,6 +1,6 @@ /* Resolving ambiguity of argument lists: Progressive parsing of an argument list, keeping track of all possibilities. - Copyright (C) 2001-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2025 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 @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-arglist-parser.h" diff --git a/gettext-tools/src/xg-check.c b/gettext-tools/src/xg-check.c index c8e73b19c..98e401cf7 100644 --- a/gettext-tools/src/xg-check.c +++ b/gettext-tools/src/xg-check.c @@ -16,9 +16,7 @@ /* Written by Daiki Ueno and Bruno Haible . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-check.h" diff --git a/gettext-tools/src/xg-encoding.c b/gettext-tools/src/xg-encoding.c index 08d3f8a32..3acda611e 100644 --- a/gettext-tools/src/xg-encoding.c +++ b/gettext-tools/src/xg-encoding.c @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-encoding.h" diff --git a/gettext-tools/src/xg-formatstring.c b/gettext-tools/src/xg-formatstring.c index 998896c2b..bde76bfbb 100644 --- a/gettext-tools/src/xg-formatstring.c +++ b/gettext-tools/src/xg-formatstring.c @@ -1,5 +1,5 @@ /* Language-dependent format strings. - Copyright (C) 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-formatstring.h" diff --git a/gettext-tools/src/xg-message.c b/gettext-tools/src/xg-message.c index bd2213750..d18988316 100644 --- a/gettext-tools/src/xg-message.c +++ b/gettext-tools/src/xg-message.c @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-message.h" diff --git a/gettext-tools/src/xg-mixed-string.c b/gettext-tools/src/xg-mixed-string.c index 7a53d11f6..b5109832c 100644 --- a/gettext-tools/src/xg-mixed-string.c +++ b/gettext-tools/src/xg-mixed-string.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-mixed-string.h" diff --git a/gettext-tools/src/xg-pos.c b/gettext-tools/src/xg-pos.c index 7eb06e9c8..3009a6263 100644 --- a/gettext-tools/src/xg-pos.c +++ b/gettext-tools/src/xg-pos.c @@ -1,5 +1,5 @@ /* The source file position. - Copyright (C) 2001-2018 Free Software Foundation, Inc. + Copyright (C) 2001-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xg-pos.h" diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index 5f7fa51df..5b04ceb2b 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/gettext-tools/tests/format-c-3-prg.c b/gettext-tools/tests/format-c-3-prg.c index 4725e591a..c72b79127 100644 --- a/gettext-tools/tests/format-c-3-prg.c +++ b/gettext-tools/tests/format-c-3-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the format-c-3 test. - Copyright (C) 2002, 2009, 2013, 2018, 2020, 2023 Free Software Foundation, Inc. + Copyright (C) 2002-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/tests/format-c-4-prg.c b/gettext-tools/tests/format-c-4-prg.c index 754b66ce8..6f94f35e7 100644 --- a/gettext-tools/tests/format-c-4-prg.c +++ b/gettext-tools/tests/format-c-4-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the format-c-4 test. - Copyright (C) 2002, 2009, 2013, 2018, 2020, 2023 Free Software Foundation, Inc. + Copyright (C) 2002-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/tests/format-c-5-prg.c b/gettext-tools/tests/format-c-5-prg.c index 01e5c99c5..be63425d4 100644 --- a/gettext-tools/tests/format-c-5-prg.c +++ b/gettext-tools/tests/format-c-5-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the format-c-5 test. - Copyright (C) 2004, 2006, 2010, 2018, 2023 Free Software Foundation, Inc. + Copyright (C) 2004-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/gettext-tools/tests/gettextpo-1-prg.c b/gettext-tools/tests/gettextpo-1-prg.c index 4c6c2bf13..1bee8bff2 100644 --- a/gettext-tools/tests/gettextpo-1-prg.c +++ b/gettext-tools/tests/gettextpo-1-prg.c @@ -1,5 +1,5 @@ /* Test of public API for GNU gettext PO files. - Copyright (C) 2010, 2020 Free Software Foundation, Inc. + Copyright (C) 2010-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2010. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "gettext-po.h" diff --git a/gettext-tools/tests/intl-1-prg.c b/gettext-tools/tests/intl-1-prg.c index cda076140..657c71614 100644 --- a/gettext-tools/tests/intl-1-prg.c +++ b/gettext-tools/tests/intl-1-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-1 test. - Copyright (C) 2000, 2005, 2007, 2013, 2018 Free Software Foundation, Inc. + Copyright (C) 2000-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-3-prg.c b/gettext-tools/tests/intl-3-prg.c index e8b064cf4..23f522ed7 100644 --- a/gettext-tools/tests/intl-3-prg.c +++ b/gettext-tools/tests/intl-3-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-3 test. - Copyright (C) 2000, 2005, 2007, 2013, 2018 Free Software Foundation, Inc. + Copyright (C) 2000-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-4-prg.c b/gettext-tools/tests/intl-4-prg.c index df4c6fea8..bcda5ef6d 100644 --- a/gettext-tools/tests/intl-4-prg.c +++ b/gettext-tools/tests/intl-4-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-4 test. - Copyright (C) 2001, 2005-2006, 2013, 2018 Free Software Foundation, Inc. + Copyright (C) 2001-2025 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 @@ -17,9 +17,7 @@ /* Contributed to the GNU C Library by Bruno Haible , 2001. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-5-prg.c b/gettext-tools/tests/intl-5-prg.c index 76322c7bd..3facdcff8 100644 --- a/gettext-tools/tests/intl-5-prg.c +++ b/gettext-tools/tests/intl-5-prg.c @@ -1,5 +1,5 @@ /* Test that gettext() does not crash by stack overflow when msgid is very long. - Copyright (C) 2007, 2014, 2018 Free Software Foundation, Inc. + Copyright (C) 2007-2025 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 @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2007. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-6-prg.c b/gettext-tools/tests/intl-6-prg.c index 0cf4bf843..d4b6ae3dd 100644 --- a/gettext-tools/tests/intl-6-prg.c +++ b/gettext-tools/tests/intl-6-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-6 test. - Copyright (C) 2000, 2005, 2007, 2013, 2018, 2020, 2023 Free Software Foundation, Inc. + Copyright (C) 2000-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-7-prg.c b/gettext-tools/tests/intl-7-prg.c index 6c62c7fca..11b176213 100644 --- a/gettext-tools/tests/intl-7-prg.c +++ b/gettext-tools/tests/intl-7-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-7 test. - Copyright (C) 2000, 2005, 2007, 2013, 2018, 2020, 2023 Free Software Foundation, Inc. + Copyright (C) 2000-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-setlocale-1-prg.c b/gettext-tools/tests/intl-setlocale-1-prg.c index be2344186..37dfb675d 100644 --- a/gettext-tools/tests/intl-setlocale-1-prg.c +++ b/gettext-tools/tests/intl-setlocale-1-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-setlocale-1 test. - Copyright (C) 2000, 2005, 2007, 2013, 2018 Free Software Foundation, Inc. + Copyright (C) 2000-2025 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 @@ -17,9 +17,7 @@ /* Contributed to the GNU C Library by Thorsten Kukuk and Andreas Jaeger , 2000. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-setlocale-2-prg.c b/gettext-tools/tests/intl-setlocale-2-prg.c index 6c7e5548c..16645f733 100644 --- a/gettext-tools/tests/intl-setlocale-2-prg.c +++ b/gettext-tools/tests/intl-setlocale-2-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-setlocale-2 test. - Copyright (C) 2005, 2007, 2013, 2018 Free Software Foundation, Inc. + Copyright (C) 2005-2025 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 @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2005. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-thread-1-prg.c b/gettext-tools/tests/intl-thread-1-prg.c index e10d22889..9eedc0fe1 100644 --- a/gettext-tools/tests/intl-thread-1-prg.c +++ b/gettext-tools/tests/intl-thread-1-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-thread-1 test. - Copyright (C) 2005-2007, 2009-2010, 2013, 2018-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2025 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 @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2005, 2018. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-thread-2-prg.c b/gettext-tools/tests/intl-thread-2-prg.c index cf3ef50c2..0044800f1 100644 --- a/gettext-tools/tests/intl-thread-2-prg.c +++ b/gettext-tools/tests/intl-thread-2-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-thread-2 test. - Copyright (C) 2005-2007, 2009-2010, 2013, 2018-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2025 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 @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2005. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-thread-3-prg.c b/gettext-tools/tests/intl-thread-3-prg.c index 0f9b6e76f..94f28cd66 100644 --- a/gettext-tools/tests/intl-thread-3-prg.c +++ b/gettext-tools/tests/intl-thread-3-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the intl-thread-3 test. - Copyright (C) 2005-2007, 2009-2010, 2013, 2018-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2025 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 @@ -16,9 +16,7 @@ /* Written by Bruno Haible , 2005. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/intl-version-prg.c b/gettext-tools/tests/intl-version-prg.c index b6f0ff6b7..4e61dccdd 100644 --- a/gettext-tools/tests/intl-version-prg.c +++ b/gettext-tools/tests/intl-version-prg.c @@ -1,5 +1,5 @@ /* Test of public API of . - Copyright (C) 2019 Free Software Foundation, Inc. + Copyright (C) 2019-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2019. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Make sure we use the included libintl, not the system's one. */ #undef _LIBINTL_H diff --git a/gettext-tools/tests/plural-1-prg.c b/gettext-tools/tests/plural-1-prg.c index 982ea47ba..e5dde0376 100644 --- a/gettext-tools/tests/plural-1-prg.c +++ b/gettext-tools/tests/plural-1-prg.c @@ -1,5 +1,5 @@ /* Test program, used by the plural-1 test. - Copyright (C) 2001-2002, 2009, 2013, 2018, 2020 Free Software Foundation, Inc. + Copyright (C) 2001-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/sentence-1-prg.c b/gettext-tools/tests/sentence-1-prg.c index a53291b83..dc73ebcce 100644 --- a/gettext-tools/tests/sentence-1-prg.c +++ b/gettext-tools/tests/sentence-1-prg.c @@ -1,5 +1,5 @@ /* Test of sentence handling. - Copyright (C) 2015-2016 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. Written by Daiki Ueno , 2015. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include -#endif #include "sentence.h" diff --git a/gettext-tools/tests/setlocale.c b/gettext-tools/tests/setlocale.c index e48b38cf2..56cda3c05 100644 --- a/gettext-tools/tests/setlocale.c +++ b/gettext-tools/tests/setlocale.c @@ -1,5 +1,5 @@ /* Fake setlocale - platform independent, for testing purposes. - Copyright (C) 2001-2002, 2019-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/testlocale.c b/gettext-tools/tests/testlocale.c index eca617e78..9bd108531 100644 --- a/gettext-tools/tests/testlocale.c +++ b/gettext-tools/tests/testlocale.c @@ -1,5 +1,5 @@ /* testlocale - test whether the locale given by the environment is installed. - Copyright (C) 2003, 2006, 2019 Free Software Foundation, Inc. + Copyright (C) 2003-2025 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 @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c index cd97be1d5..66828a7d9 100644 --- a/gettext-tools/tests/tstgettext.c +++ b/gettext-tools/tests/tstgettext.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c index 5efe49d54..d88abaa7d 100644 --- a/gettext-tools/tests/tstngettext.c +++ b/gettext-tools/tests/tstngettext.c @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/gnulib-local/lib/markup.c b/gnulib-local/lib/markup.c index 7c17d41fa..f182ab665 100644 --- a/gnulib-local/lib/markup.c +++ b/gnulib-local/lib/markup.c @@ -28,7 +28,7 @@ * see . */ -#include "config.h" +#include #include #include diff --git a/libtextstyle/lib/color.c b/libtextstyle/lib/color.c index 41a73e081..32734b031 100644 --- a/libtextstyle/lib/color.c +++ b/libtextstyle/lib/color.c @@ -1,5 +1,5 @@ /* Color and styling handling. - Copyright (C) 2006-2008, 2019-2020, 2023 Free Software Foundation, Inc. + Copyright (C) 2006-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2006. This program is free software: you can redistribute it and/or modify @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "color.h" -- 2.47.3