Avoid some "gcc -pedantic" warnings.

diff --git a/ChangeLog b/ChangeLog
index 7e9ec6c46bff0cbabafec4674b1c0bf5d2195b30..770a8228db44b95cffb92c74215db62563f6327e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+2008-08-29  Bruno Haible  <bruno@clisp.org>
+
+       Avoid some "gcc -pedantic" warnings.
+       * m4/include_next.m4 (gl_INCLUDE_NEXT): Set also PRAGMA_SYSTEM_HEADER.
+       * lib/arpa_inet.in.h: Use PRAGMA_SYSTEM_HEADER.
+       * lib/dirent.in.h: Likewise.
+       * lib/fcntl.in.h: Likewise.
+       * lib/float.in.h: Likewise.
+       * lib/iconv.in.h: Likewise.
+       * lib/inttypes.in.h: Likewise.
+       * lib/locale.in.h: Likewise.
+       * lib/math.in.h: Likewise.
+       * lib/netinet_in.in.h: Likewise.
+       * lib/search.in.h: Likewise.
+       * lib/signal.in.h: Likewise.
+       * lib/stdarg.in.h: Likewise.
+       * lib/stdint.in.h: Likewise.
+       * lib/stdio.in.h: Likewise.
+       * lib/stdlib.in.h: Likewise.
+       * lib/string.in.h: Likewise.
+       * lib/strings.in.h: Likewise.
+       * lib/sys_select.in.h: Likewise.
+       * lib/sys_socket.in.h: Likewise.
+       * lib/sys_stat.in.h: Likewise.
+       * lib/sys_time.in.h: Likewise.
+       * lib/sysexits.in.h: Likewise.
+       * lib/time.in.h: Likewise.
+       * lib/unistd.in.h: Likewise.
+       * lib/wchar.in.h: Likewise.
+       * lib/wctype.in.h: Likewise.
+       * modules/arpa_inet (Makefile.am): Also substitute PRAGMA_SYSTEM_HEADER.
+       * modules/fchdir (Makefile.am): Likewise.
+       * modules/fcntl (Makefile.am): Likewise.
+       * modules/float (Makefile.am): Likewise.
+       * modules/iconv_open (Makefile.am): Likewise.
+       * modules/inttypes (Makefile.am): Likewise.
+       * modules/locale (Makefile.am): Likewise.
+       * modules/math (Makefile.am): Likewise.
+       * modules/netinet_in (Makefile.am): Likewise.
+       * modules/search (Makefile.am): Likewise.
+       * modules/signal (Makefile.am): Likewise.
+       * modules/stdarg (Makefile.am): Likewise.
+       * modules/stdint (Makefile.am): Likewise.
+       * modules/stdio (Makefile.am): Likewise.
+       * modules/stdlib (Makefile.am): Likewise.
+       * modules/string (Makefile.am): Likewise.
+       * modules/strings (Makefile.am): Likewise.
+       * modules/sys_select (Makefile.am): Likewise.
+       * modules/sys_socket (Makefile.am): Likewise.
+       * modules/sys_stat (Makefile.am): Likewise.
+       * modules/sys_time (Makefile.am): Likewise.
+       * modules/sysexits (Makefile.am): Likewise.
+       * modules/time (Makefile.am): Likewise.
+       * modules/unistd (Makefile.am): Likewise.
+       * modules/wchar (Makefile.am): Likewise.
+       * modules/wctype (Makefile.am): Likewise.
+       Reported by Reuben Thomas <rrt@sc3d.org>.
+
 2008-08-29  Bruno Haible  <bruno@clisp.org>
 
        * m4/include_next.m4 (gl_INCLUDE_NEXT): Don't define HAVE_INCLUDE_NEXT

diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h
index 6d62825763255b477ba292e05362c19e1325f93a..a790ac3da088d5f727ccbf5cd0a926870b84ebb0 100644 (file)
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -24,6 +24,8 @@
 
 #if @HAVE_ARPA_INET_H@
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_ARPA_INET_H@
 

diff --git a/lib/dirent.in.h b/lib/dirent.in.h
index db3de951137757591eccfe44e6c74204628c82e3..494d71abb74d32065532f14e9d970c96ee904d6f 100644 (file)
--- a/lib/dirent.in.h
+++ b/lib/dirent.in.h
@@ -1,5 +1,5 @@
 /* Wrapper around <dirent.h>.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008 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,6 +16,8 @@
 
 #ifndef _GL_DIRENT_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_DIRENT_H@
 

diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h
index 066a26c70e9915316e53744956d7f18a3ab3e725..82e9b3aa10cc1b218c135b4eed3c38ee94aa94f8 100644 (file)
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008 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,6 +19,8 @@
 
 #ifndef _GL_FCNTL_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

diff --git a/lib/float.in.h b/lib/float.in.h
index 2504032077613b6e900db1b118e2e56d692c6f5a..82780416431def73d99576d98dfe0166a0766783 100644 (file)
--- a/lib/float.in.h
+++ b/lib/float.in.h
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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,6 +17,8 @@
 
 #ifndef _GL_FLOAT_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FLOAT_H@
 

diff --git a/lib/iconv.in.h b/lib/iconv.in.h
index 1387f2536e26cccfc3142bedd03fb956197c243e..a5f9c01acf960040b51c3fa24a279da912c0c827 100644 (file)
--- a/lib/iconv.in.h
+++ b/lib/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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
@@ -18,6 +18,8 @@
 
 #ifndef _GL_ICONV_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ICONV_H@
 

diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h
index 8a24850562eb82c03da20d9b2350daf4073e69ec..abce3bc1ca837491adcb5a6a7f789bbf7b923643 100644 (file)
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2007 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2008 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
@@ -26,6 +26,7 @@
    The include_next requires a split double-inclusion guard.  */
 #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 # if @HAVE_INTTYPES_H@
+@PRAGMA_SYSTEM_HEADER@
 #  @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
 # endif
 #endif

diff --git a/lib/locale.in.h b/lib/locale.in.h
index 821787ef182a609f9aea24c4c76eb03762c39c58..efbe08f262840aa876c7f313cde464887aad086a 100644 (file)
--- a/lib/locale.in.h
+++ b/lib/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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,6 +16,8 @@
 
 #ifndef _GL_LOCALE_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_LOCALE_H@
 

diff --git a/lib/math.in.h b/lib/math.in.h
index 4ff8fc9645de9724c2e3c73a0782afb3b967e50d..3ffb1774b455096df464d63bdb8ef3efa50b8bf3 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -17,6 +17,8 @@
 
 #ifndef _GL_MATH_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_MATH_H@
 

diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h
index aa00e45ced99a2ca2f1db768ef1dd943b6ac2d7e..e01b3666295fd6c81e6157b3fb095343341b1cf9 100644 (file)
--- a/lib/netinet_in.in.h
+++ b/lib/netinet_in.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <netinet/in.h>.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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,6 +19,8 @@
 
 #if @HAVE_NETINET_IN_H@
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* On many platforms, <netinet/in.h> assumes prior inclusion of
    <sys/types.h>.  */
 # include <sys/types.h>

diff --git a/lib/search.in.h b/lib/search.in.h
index 6ab763dacaba404aac4f6e80bcc0411f3346d81c..0114b468067bec53ecf8e7f7f5f2efc0b8b28fb8 100644 (file)
--- a/lib/search.in.h
+++ b/lib/search.in.h
@@ -19,6 +19,7 @@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SEARCH_H@
+@PRAGMA_SYSTEM_HEADER@
 # @INCLUDE_NEXT@ @NEXT_SEARCH_H@
 #endif
 

diff --git a/lib/signal.in.h b/lib/signal.in.h
index 7df5d5f71b1bb9787e32f40cb453a662294e9f27..fce94f31c90821456eb226cbd811b912ece34be5 100644 (file)
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -15,6 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+@PRAGMA_SYSTEM_HEADER@
+
 #if defined __need_sig_atomic_t || defined __need_sigset_t
 /* Special invocation convention inside glibc header files.  */
 

diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h
index 7d37a593600ea86703db2cdce093b0951e684426..9d8b0c4fb9e7cbd04e17ec9a23d6ba8e7cf7c302 100644 (file)
--- a/lib/stdarg.in.h
+++ b/lib/stdarg.in.h
@@ -17,6 +17,8 @@
 
 #ifndef _GL_STDARG_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDARG_H@
 

diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index 265bd878a064dca8271e67880763968f23417437..4fc3287752305d0f069ac3be21b2f56f6f9e7842 100644 (file)
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2007 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2008 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -49,6 +49,7 @@
      in <inttypes.h> would reinclude us, skipping our contents because
      _GL_STDINT_H is defined.
      The include_next requires a split double-inclusion guard.  */
+@PRAGMA_SYSTEM_HEADER@
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #endif
 

diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index 39449555aa03da65ea544ba652f72c1ed9a65c2d..1d3170a940d8e2a2db1fdd678b343840d1ce6fb0 100644 (file)
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -16,6 +16,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+@PRAGMA_SYSTEM_HEADER@
+
 #if defined __need_FILE || defined __need___FILE
 /* Special invocation convention inside glibc header files.  */
 

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index b0fb12fcbc9fbcb9d86e18c24a8a22172c916281..a55c333035426e6fb5c8128b39fdeea24db5ff38 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -15,6 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+@PRAGMA_SYSTEM_HEADER@
+
 #if defined __need_malloc_and_calloc
 /* Special invocation convention inside glibc header files.  */
 

diff --git a/lib/string.in.h b/lib/string.in.h
index e62b8dd2e81b19f167490bce2cd621e7551a586d..a193d8932e66f9cf23d61eec476cf4b78220fccd 100644 (file)
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -18,6 +18,8 @@
 
 #ifndef _GL_STRING_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STRING_H@
 

diff --git a/lib/strings.in.h b/lib/strings.in.h
index d87bc417a55f1fdc04dc6246fe136baa139fcf1c..50470943dc78dd0f0084de60ac471cfc765dde54 100644 (file)
--- a/lib/strings.in.h
+++ b/lib/strings.in.h
@@ -1,6 +1,6 @@
 /* A substitute <strings.h>.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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
@@ -18,6 +18,8 @@
 
 #ifndef _GL_STRINGS_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STRINGS_H@
 

diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 056720262283dd542151b7df3ae90b342c29c994..86ae53931b820029b0d2bf0ef91f5e2abfdfc7c7 100644 (file)
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <sys/select.h>.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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,6 +19,8 @@
 
 #if @HAVE_SYS_SELECT_H@
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* On many platforms, <sys/select.h> assumes prior inclusion of
    <sys/types.h>.  */
 # include <sys/types.h>

diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index ea39a352a5a6878f4e56fb013c8282a927719be8..d237e9c457e6056a04dc17069742eb47f3f6551e 100644 (file)
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -27,6 +27,8 @@
 
 #if @HAVE_SYS_SOCKET_H@
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* On many platforms, <sys/socket.h> assumes prior inclusion of
    <sys/types.h>.  */
 # include <sys/types.h>

diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index 34ff96253ece8011b1c80c24e55da1b523bae62f..7d0a1117f5162a28079a4789e69d9fd2b044be62 100644 (file)
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -23,6 +23,8 @@
 
 #ifndef _GL_SYS_STAT_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
 

diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h
index 296d20df47b2934a424c42f69b3037e22bfa3c8d..e7c092ab83a0fcd1972cb8694667f2b7b512df0c 100644 (file)
--- a/lib/sys_time.in.h
+++ b/lib/sys_time.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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
@@ -18,6 +18,8 @@
 
 /* Written by Paul Eggert.  */
 
+@PRAGMA_SYSTEM_HEADER@
+
 #if defined _GL_SYS_TIME_H
 
 /* Simply delegate to the system's header, without adding anything.  */

diff --git a/lib/sysexits.in.h b/lib/sysexits.in.h
index 895d31e94c078a234f779d676a0583a6d615175d..14b0b364d960d96775564029a20d498d00cbaab2 100644 (file)
--- a/lib/sysexits.in.h
+++ b/lib/sysexits.in.h
@@ -1,5 +1,5 @@
 /* exit() exit codes for some BSD system programs.
-   Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2008 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
@@ -20,6 +20,8 @@
 
 #if @HAVE_SYSEXITS_H@
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* IRIX 6.5 has an <unistd.h> that defines a macro EX_OK with a nonzero
    value.  Override it.  See
    <http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00361.html>  */

diff --git a/lib/time.in.h b/lib/time.in.h
index 4d5cab8dafae71e09edf90e1e44ee1f34d8859fc..bb3bd01bf579adbbd2cc6a0041c133ea3f734f90 100644 (file)
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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,6 +16,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* Don't get in the way of glibc when it includes time.h merely to
    declare a few standard symbols, rather than to declare all the
    symbols.  Also, Solaris 8 <time.h> eventually includes itself

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 346b8b4beea1b7c3c49dbc9e4f9a8a97605d8607..500de9ce1878a49398eb2c3d3158e2e1b82ecc10 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -17,6 +17,8 @@
 
 #ifndef _GL_UNISTD_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@

diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index e6fd392bd580e1d8f081eb7a4b8b59578b2c8d3b..8ed292ccce5392127abdc3d1cc8a8615d597cab7 100644 (file)
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -26,6 +26,8 @@
  * the declaration of wcwidth().
  */
 
+@PRAGMA_SYSTEM_HEADER@
+
 #ifdef __need_mbstate_t
 /* Special invocation convention inside uClibc header files.  */
 

diff --git a/lib/wctype.in.h b/lib/wctype.in.h
index feb66565d19e1fe47006594feaf3c775f4f8e8ad..fc1b5c0827fe8032c02f70f9ae1bf11dab0b6483 100644 (file)
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -28,6 +28,8 @@
 
 #ifndef _GL_WCTYPE_H
 
+@PRAGMA_SYSTEM_HEADER@
+
 #if @HAVE_WINT_T@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
    Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before

diff --git a/m4/include_next.m4 b/m4/include_next.m4
index e4b0006590531d2987e16c25ed7c59c934f9e8a6..08c63dbc2c667988532f062e38adde8dc5c69dac 100644 (file)
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -6,6 +6,21 @@ dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert and Derek Price.
 
+dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER.
+dnl
+dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to
+dnl 'include' otherwise.
+dnl
+dnl PRAGMA_SYSTEM_HEADER can be used in files that contain #include_next,
+dnl so as to avoid GCC warnings when the gcc option -pedantic is used.
+dnl '#pragma GCC system_header' has the same effect as if the file was found
+dnl through the include search path specified with '-isystem' options (as
+dnl opposed to the search path specified with '-I' options). Namely, gcc
+dnl does not warn about some things, and on some systems (Solaris and Interix)
+dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
+dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
+dnl of plain '__STDC__'.
+
 AC_DEFUN([gl_INCLUDE_NEXT],
 [
   AC_LANG_PREPROC_REQUIRE()
@@ -36,12 +51,17 @@ EOF
      CPPFLAGS="$save_CPPFLAGS"
      rm -rf conftestd1 conftestd2
     ])
+  PRAGMA_SYSTEM_HEADER=
   if test $gl_cv_have_include_next = yes; then
     INCLUDE_NEXT=include_next
+    if test -n "$GCC"; then
+      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
+    fi
   else
     INCLUDE_NEXT=include
   fi
   AC_SUBST([INCLUDE_NEXT])
+  AC_SUBST([PRAGMA_SYSTEM_HEADER])
 ])
 
 # gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)

diff --git a/modules/arpa_inet b/modules/arpa_inet
index 75092bea82fed40edd0721f3d5390e3c7ca508e2..e98a53161fd19312a6f4af8e6677570af15cf2a3 100644 (file)
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -22,7 +22,8 @@ arpa/inet.h:
        @MKDIR_P@ arpa
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \
              -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \
              -e 's|@''GNULIB_INET_NTOP''@|$(GNULIB_INET_NTOP)|g' \

diff --git a/modules/fchdir b/modules/fchdir
index 7cb47ddda264662cf64e0ea96c2b7ecaeec9b5a5..366831413c8cc02bff63c60d66b8f6313a46e00b 100644 (file)
--- a/modules/fchdir
+++ b/modules/fchdir
@@ -29,6 +29,7 @@ dirent.h: dirent.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
              -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
              < $(srcdir)/dirent.in.h; \

diff --git a/modules/fcntl b/modules/fcntl
index 8e1f327a9260c837129deaaef1c63eec415da693..ccd26ed252bf3ee4450cd3bc1b929d52a717e371 100644 (file)
--- a/modules/fcntl
+++ b/modules/fcntl
@@ -20,7 +20,8 @@ BUILT_SOURCES += $(FCNTL_H)
 fcntl.h: fcntl.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
              -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
              -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \

diff --git a/modules/float b/modules/float
index 272e275d852b5234a8643f0162a4d111db9cf711..7199dc4887f6afdbd8a7a1e46e725b8b830bdadf 100644 (file)
--- a/modules/float
+++ b/modules/float
@@ -19,7 +19,8 @@ BUILT_SOURCES += $(FLOAT_H)
 float.h: float.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
              < $(srcdir)/float.in.h; \
        } > $@-t

diff --git a/modules/iconv_open b/modules/iconv_open
index 99530393209156476ec2734a05d69c34dd57ed67..014697ebbb399e7cf7c764eb8f7347f8c909a762 100644 (file)
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -30,7 +30,8 @@ BUILT_SOURCES += $(ICONV_H)
 iconv.h: iconv.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
              -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
              -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \

diff --git a/modules/inttypes b/modules/inttypes
index 91907d99c6740e3c26c5e313bf4aaef5d2478561..e66c491361f72f5e921fed1bb9139191f18c980d 100644 (file)
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -23,7 +23,8 @@ inttypes.h: inttypes.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
              -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
              -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \

diff --git a/modules/locale b/modules/locale
index d5c186c0e2d35b3ec24aa014d3c34b73f604f92a..d15d5d3473719dbf6d3dc1edae166d4a21ac5c37 100644 (file)
--- a/modules/locale
+++ b/modules/locale
@@ -19,7 +19,8 @@ BUILT_SOURCES += $(LOCALE_H)
 locale.h: locale.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
              < $(srcdir)/locale.in.h; \
        } > $@-t

diff --git a/modules/lock-tests b/modules/lock-tests
index 7c72c94734db4958f73b6d01b017f31b20a7b4df..d0e5010508dd528d738552fe586b7d0ef8fea844 100644 (file)
--- a/modules/lock-tests
+++ b/modules/lock-tests
@@ -2,20 +2,12 @@ Files:
 tests/test-lock.c
 
 Depends-on:
+thread
+yield
 
 configure.ac:
-dnl Checks for special libraries for the tests/test-lock test.
-dnl On some systems, sched_yield is in librt, rather than in libpthread.
-LIBSCHED=
-if test $gl_threads_api = posix; then
-  dnl Solaris has sched_yield in librt, not in libpthread or libc.
-  AC_CHECK_LIB(rt, sched_yield, [LIBSCHED=-lrt],
-    [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt.
-     AC_CHECK_LIB(posix4, sched_yield, [LIBSCHED=-lposix4])])
-fi
-AC_SUBST([LIBSCHED])
 
 Makefile.am:
 TESTS += test-lock
 check_PROGRAMS += test-lock
-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@
+test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@

diff --git a/modules/math b/modules/math
index 20ec1d670d49c0dca605ce55642ba3d6702b94b7..3250a93c74bab1b0b49bb2d41e8fa91c844e62a8 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -20,7 +20,8 @@ BUILT_SOURCES += math.h
 math.h: math.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_MATH_H''@|$(NEXT_MATH_H)|g' \
              -e 's|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \
              -e 's|@''GNULIB_CEILL''@|$(GNULIB_CEILL)|g' \

diff --git a/modules/netinet_in b/modules/netinet_in
index 149b8c77d322bf2642ab6b30723c57ad7ccab373..ee0c9ae15cd6d388e4cd02564a9ed0d87b27ff18 100644 (file)
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -22,7 +22,8 @@ netinet/in.h: netinet_in.in.h
        @MKDIR_P@ netinet
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
              -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
              < $(srcdir)/netinet_in.in.h; \

diff --git a/modules/search b/modules/search
index 186688443651dd049d27641cee29c621362be9f0..8ba2a1c2a25ba9809d360c06cab786c23ab537c2 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -21,7 +21,8 @@ search.h: search.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
              -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \
              -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \

diff --git a/modules/signal b/modules/signal
index c4fccc5f9861ffe2764c2f02e1a9198f77f3e3b6..b472fb4e199d070b543b861162cbf3aaf18be47e 100644 (file)
--- a/modules/signal
+++ b/modules/signal
@@ -20,7 +20,8 @@ BUILT_SOURCES += signal.h
 signal.h: signal.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
              -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
              -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \

diff --git a/modules/stdarg b/modules/stdarg
index f0b630f17d89dfaf8b9512a83f7bcbf67ee9cba3..46be58f143e45c42421cf7568e10701cdcf5711e 100644 (file)
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -26,7 +26,8 @@ BUILT_SOURCES += $(STDARG_H)
 stdarg.h: stdarg.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
              < $(srcdir)/stdarg.in.h; \
        } > $@-t

diff --git a/modules/stdint b/modules/stdint
index 8fd25103108de1ac86f75f024319899e15d1f935..a7ba3d397f0e21af8f0b68dcad0f406dca0f625c 100644 (file)
--- a/modules/stdint
+++ b/modules/stdint
@@ -27,7 +27,8 @@ stdint.h: stdint.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
              -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
              -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \

diff --git a/modules/stdio b/modules/stdio
index 91468d466ae608b7f066a8e08328a374eb520634..07ee3c9ec94e04f6c1e43738a5f23433bdb98304 100644 (file)
--- a/modules/stdio
+++ b/modules/stdio
@@ -20,7 +20,8 @@ BUILT_SOURCES += stdio.h
 stdio.h: stdio.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
              -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
              -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \

diff --git a/modules/stdlib b/modules/stdlib
index f7643cedf1ceb9d8988de872e7b43ea4451205b2..87c118804b07043bc1d083e7ebaa8782ef0d8c37 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -21,7 +21,8 @@ BUILT_SOURCES += stdlib.h
 stdlib.h: stdlib.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
              -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
              -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \

diff --git a/modules/string b/modules/string
index dc0063dc22964eebe80b70e34af3c33fcaa44f3d..bed47ce07f52ae009ce6eedf9ce82f657f88a951 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -21,7 +21,8 @@ BUILT_SOURCES += string.h
 string.h: string.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
              -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
              -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \

diff --git a/modules/strings b/modules/strings
index beddb2082ae68b13b599304e911646bfaca6b0c4..7936bc167ed2cb1be1e40e380cf77bc9d9c57172 100644 (file)
--- a/modules/strings
+++ b/modules/strings
@@ -20,7 +20,8 @@ BUILT_SOURCES += strings.h
 strings.h: strings.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
              -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
              -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \

diff --git a/modules/sys_select b/modules/sys_select
index 67fa2d16192465f393d139d0988091594979ca8b..74e43b29879c2925dd5eecd04d03f3463180963e 100644 (file)
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -22,7 +22,8 @@ sys/select.h: sys_select.in.h
        @MKDIR_P@ sys
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
              -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \
              < $(srcdir)/sys_select.in.h; \

diff --git a/modules/sys_socket b/modules/sys_socket
index 36af3cbca149457bdee0d8ec5ac32a2c26dc66ee..d619a548cd466ff4b47316fba731d22620619038 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -21,7 +21,8 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 sys/socket.h: sys_socket.in.h
        @MKDIR_P@ sys
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
              -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
              -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \

diff --git a/modules/sys_stat b/modules/sys_stat
index bb3510fe400fd7d3497f5156c1cce859da207d25..f36f57a6d1e822cb5bd052f6b235a298c9c909c0 100644 (file)
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -21,7 +21,8 @@ sys/stat.h: sys_stat.in.h
        @MKDIR_P@ sys
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
              -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
              -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \

diff --git a/modules/sys_time b/modules/sys_time
index e261583aa6f88c914d77d8130969249fcd476977..77a20d6cda1fa7980732bafc0236afc34a87629e 100644 (file)
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -22,7 +22,8 @@ sys/time.h: sys_time.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
              -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
              -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \

diff --git a/modules/sysexits b/modules/sysexits
index bb1b7e3b1d40afe85db46059e91a096641b383dc..1f8460304310c8c77480fc17851f132507667f2d 100644 (file)
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -19,7 +19,8 @@ BUILT_SOURCES += $(SYSEXITS_H)
 sysexits.h: sysexits.in.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \
              < $(srcdir)/sysexits.in.h; \
        } > $@-t

diff --git a/modules/time b/modules/time
index 9cdfa4c936f01ba3df429c7e844aa108fcc5ae5d..50b07afb29ceb049a36139b4c6cc2a566c7829a4 100644 (file)
--- a/modules/time
+++ b/modules/time
@@ -20,7 +20,8 @@ BUILT_SOURCES += time.h
 time.h: time.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
              -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
              -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \

diff --git a/modules/tls-tests b/modules/tls-tests
index b9f5a2313153ad84a2294800cb1fb69c8e80a63c..107cfe45f65e73106072a080bc12920f441dc74d 100644 (file)
--- a/modules/tls-tests
+++ b/modules/tls-tests
@@ -2,21 +2,13 @@ Files:
 tests/test-tls.c
 
 Depends-on:
+thread
+yield
 
 configure.ac:
-dnl Checks for special libraries for the tests/test-tls test.
-dnl On some systems, sched_yield is in librt, rather than in libpthread.
-LIBSCHED=
-if test $gl_threads_api = posix; then
-  dnl Solaris has sched_yield in librt, not in libpthread or libc.
-  AC_CHECK_LIB(rt, sched_yield, [LIBSCHED=-lrt],
-    [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt.
-     AC_CHECK_LIB(posix4, sched_yield, [LIBSCHED=-lposix4])])
-fi
-AC_SUBST([LIBSCHED])
 
 Makefile.am:
 TESTS += test-tls
 check_PROGRAMS += test-tls
-test_tls_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@
+test_tls_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 

diff --git a/modules/unistd b/modules/unistd
index 88fc993c89678e25567e75f1f8f2ac1a5a9a4951..07edf7f2276838e9624213ff0f084a5b289b4f34 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -21,7 +21,8 @@ unistd.h: unistd.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
              -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
              -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \

diff --git a/modules/wchar b/modules/wchar
index 6f685824b3ff6f9471444b3550952cfada931cec..423558d94ec09e5af9544ef522db044a20230fc4 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -20,7 +20,8 @@ BUILT_SOURCES += $(WCHAR_H)
 wchar.h: wchar.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
              -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
              -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \

diff --git a/modules/wctype b/modules/wctype
index b8ee21abb8fee547f870c6753a8fb4ca8c85ffef..73c92717ea00d0980dd773ea86c2bbda77f40e1f 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -21,7 +21,8 @@ wctype.h: wctype.in.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-             -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
              -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \