From 99099106c3c1cb16ed1e91be970332fe225e278b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 14 Sep 2006 14:18:36 +0000 Subject: [PATCH] Include unconditionally. --- lib/ChangeLog | 85 +++++++++++++++++++++++++++++++++++---- lib/allocsa.c | 6 +-- lib/asnprintf.c | 6 +-- lib/asprintf.c | 6 +-- lib/c-strcasecmp.c | 6 +-- lib/c-strcasestr.c | 6 +-- lib/c-strncasecmp.c | 6 +-- lib/c-strstr.c | 4 +- lib/classpath.c | 4 +- lib/clean-temp.c | 4 +- lib/concatpath.c | 6 +-- lib/copy-file.c | 4 +- lib/csharpcomp.c | 4 +- lib/csharpexec.c | 6 +-- lib/execute.c | 4 +- lib/fatal-signal.c | 4 +- lib/findprog.c | 4 +- lib/fwriteerror.c | 4 +- lib/gl_array_list.c | 4 +- lib/gl_array_oset.c | 4 +- lib/gl_avltree_list.c | 4 +- lib/gl_avltree_oset.c | 4 +- lib/gl_avltreehash_list.c | 4 +- lib/gl_carray_list.c | 4 +- lib/gl_linked_list.c | 4 +- lib/gl_linkedhash_list.c | 4 +- lib/gl_list.c | 4 +- lib/gl_oset.c | 4 +- lib/gl_rbtree_list.c | 4 +- lib/gl_rbtree_oset.c | 4 +- lib/gl_rbtreehash_list.c | 4 +- lib/imaxabs.c | 4 +- lib/imaxdiv.c | 4 +- lib/javacomp.c | 4 +- lib/javaexec.c | 4 +- lib/javaversion.c | 4 +- lib/linebreak.c | 6 +-- lib/localcharset.c | 4 +- lib/lock.c | 6 +-- lib/mbchar.c | 6 +-- lib/mbswidth.c | 4 +- lib/mkdtemp.c | 4 +- lib/pipe.c | 4 +- lib/printf-args.c | 4 +- lib/printf-parse.c | 6 +-- lib/progname.c | 6 +-- lib/progreloc.c | 4 +- lib/readlink.c | 6 +-- lib/sh-quote.c | 6 +-- lib/stpcpy.c | 6 +-- lib/stpncpy.c | 6 +-- lib/strcasecmp.c | 6 +-- lib/strcasestr.c | 6 +-- lib/strcspn.c | 6 +-- lib/striconv.c | 4 +- lib/strncasecmp.c | 6 +-- lib/strnlen1.c | 6 +-- lib/strstr.c | 6 +-- lib/strtok_r.c | 6 +-- lib/tls.c | 6 +-- lib/tmpdir.c | 4 +- lib/unicodeio.c | 4 +- lib/unsetenv.c | 4 +- lib/vasnprintf.c | 4 +- lib/vasprintf.c | 4 +- lib/wait-process.c | 6 +-- lib/xallocsa.c | 6 +-- lib/xsetenv.c | 6 +-- lib/xstriconv.c | 4 +- 69 files changed, 174 insertions(+), 239 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 7b53e0d617..cb37d4a1b6 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,74 @@ +2006-09-14 Bruno Haible + + * allocsa.c: Include unconditionally. + * asnprintf.c: Likewise. + * asprintf.c: Likewise. + * c-strcasecmp.c: Likewise. + * c-strcasestr.c: Likewise. + * c-strncasecmp.c: Likewise. + * c-strstr.c: Likewise. + * classpath.c: Likewise. + * clean-temp.c: Likewise. + * concatpath.c: Likewise. + * copy-file.c: Likewise. + * csharpcomp.c: Likewise. + * csharpexec.c: Likewise. + * execute.c: Likewise. + * fatal-signal.c: Likewise. + * findprog.c: Likewise. + * fwriteerror.c: Likewise. + * gl_array_list.c: Likewise. + * gl_array_oset.c: Likewise. + * gl_avltree_list.c: Likewise. + * gl_avltree_oset.c: Likewise. + * gl_avltreehash_list.c: Likewise. + * gl_carray_list.c: Likewise. + * gl_linked_list.c: Likewise. + * gl_linkedhash_list.c: Likewise. + * gl_list.c: Likewise. + * gl_oset.c: Likewise. + * gl_rbtree_list.c: Likewise. + * gl_rbtree_oset.c: Likewise. + * gl_rbtreehash_list.c: Likewise. + * imaxabs.c: Likewise. + * imaxdiv.c: Likewise. + * javacomp.c: Likewise. + * javaexec.c: Likewise. + * javaversion.c: Likewise. + * linebreak.c: Likewise. + * localcharset.c: Likewise. + * lock.c: Likewise. + * mbchar.c: Likewise. + * mbswidth.c: Likewise. + * mkdtemp.c: Likewise. + * pipe.c: Likewise. + * printf-args.c: Likewise. + * printf-parse.c: Likewise. + * progname.c: Likewise. + * progreloc.c: Likewise. + * readlink.c: Likewise. + * sh-quote.c: Likewise. + * stpcpy.c: Likewise. + * stpncpy.c: Likewise. + * strcasecmp.c: Likewise. + * strcasestr.c: Likewise. + * strcspn.c: Likewise. + * striconv.c: Likewise. + * strncasecmp.c: Likewise. + * strnlen1.c: Likewise. + * strstr.c: Likewise. + * strtok_r.c: Likewise. + * tls.c: Likewise. + * tmpdir.c: Likewise. + * unicodeio.c: Likewise. + * unsetenv.c: Likewise. + * vasnprintf.c: Likewise. + * vasprintf.c: Likewise. + * wait-process.c: Likewise. + * xallocsa.c: Likewise. + * xsetenv.c: Likewise. + * xstriconv.c: Likewise. + 2006-09-13 Eric Blake * getopt.c: Fix typo in last commit. @@ -405,7 +476,7 @@ 2006-07-19 Mike Frysinger - * lib/mountlist.c [ME_REMOTE]: Filter out cifs. + * mountlist.c [ME_REMOTE]: Filter out cifs. Reported by Toralf Förster in . 2006-08-08 Eric Blake @@ -764,7 +835,7 @@ 2006-07-06 Jim Hyslop (tiny change) - * lib/getaddrinfo.c: Changes to compile under MSVC6: changed + * getaddrinfo.c: Changes to compile under MSVC6: changed '#if WIN32_NATIVE' to '#ifdef' & moved WSAAPI macro inside brackets. Other minor changes to suppress some compiler warnings. @@ -2793,7 +2864,7 @@ 2005-09-12 Ralf Wildenhues (tiny change) - * lib/base64.c: Typo. + * base64.c: Typo. (base64_encode): Put b64str in initialized data section. 2005-09-12 Derek Price @@ -2926,14 +2997,14 @@ (SIZE_MAX) [!defined SIZE_MAX]: New macro. (re_alloc_oversized, re_x2alloc_oversized, re_xnmalloc): (re_xnrealloc, re_x2nrealloc): New inline functions. - * lib/regcomp.c (init_dfa, analyze, build_range_exp, parse_bracket_exp): + * regcomp.c (init_dfa, analyze, build_range_exp, parse_bracket_exp): (build_equiv_class, build_charclass): Check for arithmetic overflow in size expression calculations. - * lib/regex_internal.c (re_string_realloc_buffers): + * regex_internal.c (re_string_realloc_buffers): (build_wcs_upper_buffer, re_node_set_add_intersect): (re_node_set_init_union, re_node_set_insert, re_node_set_insert_last): (re_dfa_add_node, register_state): Likewise. - * lib/regexec.c (re_search_stub, re_copy_regs, re_search_internal): + * regexec.c (re_search_stub, re_copy_regs, re_search_internal): (prune_impossible_nodes, push_fail_stack, set_regs, check_arrival): (build_trtable, extend_buffers, match_ctx_init, match_ctx_add_entry): (match_ctx_add_subtop, match_ctx_add_sublast): Likewise. @@ -3196,7 +3267,7 @@ (re_string_char_size_at, re_string_wchar_at, re_string_elem_size_at): Put __attribute at function definition, now that the function decl has been removed. - * lib/regex_internal.c (re_string_peek_byte_case): + * regex_internal.c (re_string_peek_byte_case): (re_string_fetch_byte_case, re_node_set_compare, re_node_set_contains): Likewise. diff --git a/lib/allocsa.c b/lib/allocsa.c index a54e2d0ca2..97652e6889 100644 --- a/lib/allocsa.c +++ b/lib/allocsa.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2006 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "allocsa.h" diff --git a/lib/asnprintf.c b/lib/asnprintf.c index 1b7f4ba396..26c3988b01 100644 --- a/lib/asnprintf.c +++ b/lib/asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006 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 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "vasnprintf.h" diff --git a/lib/asprintf.c b/lib/asprintf.c index 7c4e64a24e..29ac6cf2d1 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006 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 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "vasprintf.h" diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c index 00e3025943..13b15f989c 100644 --- a/lib/c-strcasecmp.c +++ b/lib/c-strcasecmp.c @@ -1,5 +1,5 @@ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "c-strcase.h" diff --git a/lib/c-strcasestr.c b/lib/c-strcasestr.c index dc6ff857f7..12e2e9d969 100644 --- a/lib/c-strcasestr.c +++ b/lib/c-strcasestr.c @@ -1,5 +1,5 @@ /* c-strcasestr.c -- case insensitive substring search in C locale - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005-2006 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software; you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "c-strcasestr.h" diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index 2d260efb67..274e9b7ea0 100644 --- a/lib/c-strncasecmp.c +++ b/lib/c-strncasecmp.c @@ -1,5 +1,5 @@ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "c-strcase.h" diff --git a/lib/c-strstr.c b/lib/c-strstr.c index 0cf97d6ff4..e383fe3ab7 100644 --- a/lib/c-strstr.c +++ b/lib/c-strstr.c @@ -24,9 +24,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ * * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include diff --git a/lib/classpath.c b/lib/classpath.c index ccb66de262..b87ceab49b 100644 --- a/lib/classpath.c +++ b/lib/classpath.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "classpath.h" diff --git a/lib/clean-temp.c b/lib/clean-temp.c index cffe95916e..2322e7a0d7 100644 --- a/lib/clean-temp.c +++ b/lib/clean-temp.c @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "clean-temp.h" diff --git a/lib/concatpath.c b/lib/concatpath.c index bdab6aa190..d39a1fb15c 100644 --- a/lib/concatpath.c +++ b/lib/concatpath.c @@ -1,5 +1,5 @@ /* Construct a full pathname from a directory and a filename. - Copyright (C) 2001-2004 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006 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 the @@ -18,9 +18,7 @@ /* Written by Bruno Haible . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "pathname.h" diff --git a/lib/copy-file.c b/lib/copy-file.c index 21bcfdef61..ca620dcb6e 100644 --- a/lib/copy-file.c +++ b/lib/copy-file.c @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "copy-file.h" diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c index cbc6520fbb..eed0d15e36 100644 --- a/lib/csharpcomp.c +++ b/lib/csharpcomp.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/lib/csharpexec.c b/lib/csharpexec.c index 6c25ecd1ea..e330718598 100644 --- a/lib/csharpexec.c +++ b/lib/csharpexec.c @@ -1,5 +1,5 @@ /* Execute a C# program. - Copyright (C) 2003-2005 Free Software Foundation, Inc. + Copyright (C) 2003-2006 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/lib/execute.c b/lib/execute.c index df6b1eaa84..cb72343f80 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "execute.h" diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 1c396e07cb..edf2ea96d2 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "fatal-signal.h" diff --git a/lib/findprog.c b/lib/findprog.c index f1f7ef1967..568c934858 100644 --- a/lib/findprog.c +++ b/lib/findprog.c @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "findprog.h" diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c index f010674ba4..4d4ad81b99 100644 --- a/lib/fwriteerror.c +++ b/lib/fwriteerror.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "fwriteerror.h" diff --git a/lib/gl_array_list.c b/lib/gl_array_list.c index f8010ca11f..cb39fa0fc9 100644 --- a/lib/gl_array_list.c +++ b/lib/gl_array_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_array_list.h" diff --git a/lib/gl_array_oset.c b/lib/gl_array_oset.c index 6bf1de9138..329357fbe8 100644 --- a/lib/gl_array_oset.c +++ b/lib/gl_array_oset.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_array_oset.h" diff --git a/lib/gl_avltree_list.c b/lib/gl_avltree_list.c index ed7057df73..809b237177 100644 --- a/lib/gl_avltree_list.c +++ b/lib/gl_avltree_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_avltree_list.h" diff --git a/lib/gl_avltree_oset.c b/lib/gl_avltree_oset.c index e57b4de95d..ac1185cb4c 100644 --- a/lib/gl_avltree_oset.c +++ b/lib/gl_avltree_oset.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_avltree_oset.h" diff --git a/lib/gl_avltreehash_list.c b/lib/gl_avltreehash_list.c index b74a9a29f5..d076e947f1 100644 --- a/lib/gl_avltreehash_list.c +++ b/lib/gl_avltreehash_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_avltreehash_list.h" diff --git a/lib/gl_carray_list.c b/lib/gl_carray_list.c index f6c640788b..5be0d070f3 100644 --- a/lib/gl_carray_list.c +++ b/lib/gl_carray_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_carray_list.h" diff --git a/lib/gl_linked_list.c b/lib/gl_linked_list.c index e73dd5fb49..89038aa14b 100644 --- a/lib/gl_linked_list.c +++ b/lib/gl_linked_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_linked_list.h" diff --git a/lib/gl_linkedhash_list.c b/lib/gl_linkedhash_list.c index ca7f7072f9..2faecc3fd8 100644 --- a/lib/gl_linkedhash_list.c +++ b/lib/gl_linkedhash_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_linkedhash_list.h" diff --git a/lib/gl_list.c b/lib/gl_list.c index 17c2fd9541..546cb75f1c 100644 --- a/lib/gl_list.c +++ b/lib/gl_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_list.h" diff --git a/lib/gl_oset.c b/lib/gl_oset.c index bfe1c6d827..a6733048bc 100644 --- a/lib/gl_oset.c +++ b/lib/gl_oset.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_oset.h" diff --git a/lib/gl_rbtree_list.c b/lib/gl_rbtree_list.c index 50645159fc..d9ba4462a8 100644 --- a/lib/gl_rbtree_list.c +++ b/lib/gl_rbtree_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_rbtree_list.h" diff --git a/lib/gl_rbtree_oset.c b/lib/gl_rbtree_oset.c index 2ca4fbccda..12c86325ea 100644 --- a/lib/gl_rbtree_oset.c +++ b/lib/gl_rbtree_oset.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_rbtree_oset.h" diff --git a/lib/gl_rbtreehash_list.c b/lib/gl_rbtreehash_list.c index 029b6b45ef..66ad332d69 100644 --- a/lib/gl_rbtreehash_list.c +++ b/lib/gl_rbtreehash_list.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_rbtreehash_list.h" diff --git a/lib/imaxabs.c b/lib/imaxabs.c index 7d22c711f8..2faca653ea 100644 --- a/lib/imaxabs.c +++ b/lib/imaxabs.c @@ -15,9 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include diff --git a/lib/imaxdiv.c b/lib/imaxdiv.c index 1bbfe0e420..a25666ca25 100644 --- a/lib/imaxdiv.c +++ b/lib/imaxdiv.c @@ -15,9 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include diff --git a/lib/javacomp.c b/lib/javacomp.c index 859d0725b5..f3e8a1812b 100644 --- a/lib/javacomp.c +++ b/lib/javacomp.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/lib/javaexec.c b/lib/javaexec.c index c50a30eea3..1294d7f518 100644 --- a/lib/javaexec.c +++ b/lib/javaexec.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ diff --git a/lib/javaversion.c b/lib/javaversion.c index a0dea953e1..80e6df6d75 100644 --- a/lib/javaversion.c +++ b/lib/javaversion.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "javaversion.h" diff --git a/lib/linebreak.c b/lib/linebreak.c index 594c0d238b..82aba3c842 100644 --- a/lib/linebreak.c +++ b/lib/linebreak.c @@ -1,5 +1,5 @@ /* linebreak.c - line breaking of Unicode strings - Copyright (C) 2001-2003 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006 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 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "linebreak.h" diff --git a/lib/localcharset.c b/lib/localcharset.c index 7a2cdceb16..a2fc5dc553 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -18,9 +18,7 @@ /* Written by Bruno Haible . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "localcharset.h" diff --git a/lib/lock.c b/lib/lock.c index 8487989dd0..34a59ab339 100644 --- a/lib/lock.c +++ b/lib/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005-2006 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 @@ -19,9 +19,7 @@ Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h, gthr-win32.h. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "lock.h" diff --git a/lib/mbchar.c b/lib/mbchar.c index 6facc14926..590109bd62 100644 --- a/lib/mbchar.c +++ b/lib/mbchar.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006 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 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include diff --git a/lib/mbswidth.c b/lib/mbswidth.c index 072695172b..a207d0f6e3 100644 --- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -17,9 +17,7 @@ /* Written by Bruno Haible . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "mbswidth.h" diff --git a/lib/mkdtemp.c b/lib/mkdtemp.c index 3228f05576..09b015bdca 100644 --- a/lib/mkdtemp.c +++ b/lib/mkdtemp.c @@ -17,9 +17,7 @@ /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "mkdtemp.h" diff --git a/lib/pipe.c b/lib/pipe.c index 77643b0051..19feaf4e7b 100644 --- a/lib/pipe.c +++ b/lib/pipe.c @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "pipe.h" diff --git a/lib/printf-args.c b/lib/printf-args.c index 7613456220..da00c5fb99 100644 --- a/lib/printf-args.c +++ b/lib/printf-args.c @@ -15,9 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "printf-args.h" diff --git a/lib/printf-parse.c b/lib/printf-parse.c index 3d2fb175f2..d9440f35d4 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006 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 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #if WIDE_CHAR_VERSION diff --git a/lib/progname.c b/lib/progname.c index 67ecdff70d..d3dc8cfabc 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "progname.h" diff --git a/lib/progreloc.c b/lib/progreloc.c index 6986e1edb0..e9fb647058 100644 --- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "progname.h" diff --git a/lib/readlink.c b/lib/readlink.c index 875cc9736d..63b5d5ec79 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Stub for readlink(). - Copyright (C) 2003-2005 Free Software Foundation, Inc. + Copyright (C) 2003-2006 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/lib/sh-quote.c b/lib/sh-quote.c index 2e35f22e63..eeef088fda 100644 --- a/lib/sh-quote.c +++ b/lib/sh-quote.c @@ -1,5 +1,5 @@ /* Shell quoting. - Copyright (C) 2001-2004 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006 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, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "sh-quote.h" diff --git a/lib/stpcpy.c b/lib/stpcpy.c index bb667a05ec..870fd6d445 100644 --- a/lib/stpcpy.c +++ b/lib/stpcpy.c @@ -1,5 +1,5 @@ /* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1992, 1995, 1997-1998, 2006 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. @@ -18,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include diff --git a/lib/stpncpy.c b/lib/stpncpy.c index 445128aacd..9c0b1670bc 100644 --- a/lib/stpncpy.c +++ b/lib/stpncpy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2006 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. @@ -19,9 +19,7 @@ /* This is almost copied from strncpy.c, written by Torbjorn Granlund. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "stpncpy.h" diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c index c1bac0a5af..99d5dd22a3 100644 --- a/lib/strcasecmp.c +++ b/lib/strcasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006 Free Software Foundation, Inc. Written by Bruno Haible , 2005, based on earlier glibc code. @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "strcase.h" diff --git a/lib/strcasestr.c b/lib/strcasestr.c index 64291a17cd..6812b5de88 100644 --- a/lib/strcasestr.c +++ b/lib/strcasestr.c @@ -1,5 +1,5 @@ /* Case-insensitive searching in a string. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005-2006 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software; you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "strcasestr.h" diff --git a/lib/strcspn.c b/lib/strcspn.c index 46d7d36ca5..5a8d6f9c17 100644 --- a/lib/strcspn.c +++ b/lib/strcspn.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/lib/striconv.c b/lib/striconv.c index 4ca983914f..c97d5a0c1c 100644 --- a/lib/striconv.c +++ b/lib/striconv.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "striconv.h" diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c index 0209c39ea0..f59b953a7d 100644 --- a/lib/strncasecmp.c +++ b/lib/strncasecmp.c @@ -1,5 +1,5 @@ /* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "strcase.h" diff --git a/lib/strnlen1.c b/lib/strnlen1.c index 9b0032cb2c..f74e427b0f 100644 --- a/lib/strnlen1.c +++ b/lib/strnlen1.c @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005-2006 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "strnlen1.h" diff --git a/lib/strstr.c b/lib/strstr.c index e94cef7568..f1e2ef6988 100644 --- a/lib/strstr.c +++ b/lib/strstr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005-2006 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software; you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "strstr.h" diff --git a/lib/strtok_r.c b/lib/strtok_r.c index d1522c9b51..487737db33 100644 --- a/lib/strtok_r.c +++ b/lib/strtok_r.c @@ -1,5 +1,5 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc. + Copyright (C) 1991,1996-1999,2001,2004,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -16,9 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include diff --git a/lib/tls.c b/lib/tls.c index 567fdac094..795c638e94 100644 --- a/lib/tls.c +++ b/lib/tls.c @@ -1,5 +1,5 @@ /* Thread-local storage in multithreaded situations. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005-2006 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 , 2005. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "tls.h" diff --git a/lib/tmpdir.c b/lib/tmpdir.c index f32fb62333..3e22eeff51 100644 --- a/lib/tmpdir.c +++ b/lib/tmpdir.c @@ -17,9 +17,7 @@ /* Extracted from sysdeps/posix/tempname.c. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "tmpdir.h" diff --git a/lib/unicodeio.c b/lib/unicodeio.c index 54cae5530e..0967c994f0 100644 --- a/lib/unicodeio.c +++ b/lib/unicodeio.c @@ -21,9 +21,7 @@ /* Note: This file requires the locale_charset() function. See in libiconv-1.8/libcharset/INTEGRATE for how to obtain it. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "unicodeio.h" diff --git a/lib/unsetenv.c b/lib/unsetenv.c index b26bd8dc9e..0f837440db 100644 --- a/lib/unsetenv.c +++ b/lib/unsetenv.c @@ -15,9 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #if !_LIBC diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index b68c1bbb06..345aa8a502 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -22,9 +22,7 @@ # define _GNU_SOURCE 1 #endif -#ifdef HAVE_CONFIG_H -# include -#endif +#include #ifndef IN_LIBINTL # include #endif diff --git a/lib/vasprintf.c b/lib/vasprintf.c index 91da8812b7..824707345a 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -15,9 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "vasprintf.h" diff --git a/lib/wait-process.c b/lib/wait-process.c index bca1dc4243..7593eeacb2 100644 --- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -1,5 +1,5 @@ /* Waiting for a subprocess to finish. - Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify @@ -17,9 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "wait-process.h" diff --git a/lib/xallocsa.c b/lib/xallocsa.c index 8cf70fd16c..c69128a365 100644 --- a/lib/xallocsa.c +++ b/lib/xallocsa.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation with out of memory checking. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2006 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xallocsa.h" diff --git a/lib/xsetenv.c b/lib/xsetenv.c index 547ebd3ae4..83ef48e366 100644 --- a/lib/xsetenv.c +++ b/lib/xsetenv.c @@ -1,5 +1,5 @@ /* Setting environment variables, with out-of-memory checking. - Copyright (C) 2001-2002, 2005 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2006 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xsetenv.h" diff --git a/lib/xstriconv.c b/lib/xstriconv.c index 5657eda8f2..29e76dffe5 100644 --- a/lib/xstriconv.c +++ b/lib/xstriconv.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include /* Specification. */ #include "xstriconv.h" -- 2.30.2