diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-08-30 03:09:15 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2008-08-30 03:09:15 +0200 |
| commit | c2318e88599d84748f3537b54646913f0af0eb20 (patch) | |
| tree | faae2b8061a1fc690faeea900d93980acf62e12c | |
| parent | dab70a1d6f9de4a28cde076f441ea98bb16690b2 (diff) | |
| download | gnulib-c2318e88599d84748f3537b54646913f0af0eb20.tar.gz | |
Avoid some "gcc -pedantic" warnings.
56 files changed, 197 insertions, 60 deletions
@@ -1,5 +1,63 @@ 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 any more. diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index 6d62825763..a790ac3da0 100644 --- 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 db3de95113..494d71abb7 100644 --- 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 066a26c70e..82e9b3aa10 100644 --- 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 2504032077..8278041643 100644 --- 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 1387f2536e..a5f9c01acf 100644 --- 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 8a24850562..abce3bc1ca 100644 --- 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 821787ef18..efbe08f262 100644 --- 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 4ff8fc9645..3ffb1774b4 100644 --- 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 aa00e45ced..e01b366629 100644 --- 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 6ab763daca..0114b46806 100644 --- 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 7df5d5f71b..fce94f31c9 100644 --- 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 7d37a59360..9d8b0c4fb9 100644 --- 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 265bd878a0..4fc3287752 100644 --- 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 39449555aa..1d3170a940 100644 --- 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 b0fb12fcbc..a55c333035 100644 --- 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 e62b8dd2e8..a193d8932e 100644 --- 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 d87bc417a5..50470943dc 100644 --- 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 0567202622..86ae53931b 100644 --- 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 ea39a352a5..d237e9c457 100644 --- 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 34ff96253e..7d0a1117f5 100644 --- 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 296d20df47..e7c092ab83 100644 --- 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 895d31e94c..14b0b364d9 100644 --- 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 4d5cab8daf..bb3bd01bf5 100644 --- 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 346b8b4bee..500de9ce18 100644 --- 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 e6fd392bd5..8ed292ccce 100644 --- 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 feb66565d1..fc1b5c0827 100644 --- 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 e4b0006590..08c63dbc2c 100644 --- 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 75092bea82..e98a53161f 100644 --- 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 7cb47ddda2..366831413c 100644 --- 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 8e1f327a92..ccd26ed252 100644 --- 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 272e275d85..7199dc4887 100644 --- 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 9953039320..014697ebbb 100644 --- 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 91907d99c6..e66c491361 100644 --- 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 d5c186c0e2..d15d5d3473 100644 --- 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 7c72c94734..d0e5010508 100644 --- 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 20ec1d670d..3250a93c74 100644 --- 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 149b8c77d3..ee0c9ae15c 100644 --- 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 1866884436..8ba2a1c2a2 100644 --- 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 c4fccc5f98..b472fb4e19 100644 --- 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 f0b630f17d..46be58f143 100644 --- 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 8fd2510310..a7ba3d397f 100644 --- 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 91468d466a..07ee3c9ec9 100644 --- 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 f7643cedf1..87c118804b 100644 --- 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 dc0063dc22..bed47ce07f 100644 --- 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 beddb2082a..7936bc167e 100644 --- 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 67fa2d1619..74e43b2987 100644 --- 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 36af3cbca1..d619a548cd 100644 --- 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 bb3510fe40..f36f57a6d1 100644 --- 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 e261583aa6..77a20d6cda 100644 --- 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 bb1b7e3b1d..1f84603043 100644 --- 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 9cdfa4c936..50b07afb29 100644 --- 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 b9f5a23131..107cfe45f6 100644 --- 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 88fc993c89..07edf7f227 100644 --- 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 6f685824b3..423558d94e 100644 --- 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 b8ee21abb8..73c92717ea 100644 --- 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' \ |