[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/7] gnulib-tool: transform include guards with `--macro-pref
|
From: |
Bruno Haible |
|
Subject: |
Re: [PATCH 1/7] gnulib-tool: transform include guards with `--macro-prefix' |
|
Date: |
Sun, 14 Nov 2010 21:33:26 +0100 |
|
User-agent: |
KMail/1.9.9 |
On 2010-10-12 I wrote:
> change _GL_STDLIB_H to address@hidden@_STDLIB_H in lib/stdlib.in.h,
> and arrange for @GUARD_PREFIX@ to receive a substitution value in the
> module's Makefile.am snippet. The only modification needed in gnulib-tool
> is then some help in the expansion of the Makefile.am snippet.
This implements it.
I think a new option for gnulib-tool would be overkill. Nothing can go
wrong if the guard prefix is derived from the macro_prefix automatically.
Comments?
2010-11-14 Bruno Haible <address@hidden>
Allow multiple gnulib generated include files to be combined.
* gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am):
Resolve also ${gl_include_guard_prefix} references.
(func_import, func_create_testdir): Determine include_guard_prefix and
sed_replace_include_guard_prefix from macro_prefix.
* lib/arpa_inet.in.h: Use the @GUARD_PREFIX@ placeholder.
* lib/ctype.in.h: Likewise.
* lib/dirent.in.h: Likewise.
* lib/errno.in.h: Likewise.
* lib/fcntl.in.h: Likewise.
* lib/float.in.h: Likewise.
* lib/getopt.in.h: Likewise.
* lib/iconv.in.h: Likewise.
* lib/langinfo.in.h: Likewise.
* lib/locale.in.h: Likewise.
* lib/math.in.h: Likewise.
* lib/netdb.in.h: Likewise.
* lib/netinet_in.in.h: Likewise.
* lib/poll.in.h: Likewise.
* lib/pthread.in.h: Likewise.
* lib/pty.in.h: Likewise.
* lib/sched.in.h: Likewise.
* lib/se-selinux.in.h: Likewise.
* lib/search.in.h: Likewise.
* lib/signal.in.h: Likewise.
* lib/spawn.in.h: Likewise.
* lib/stdarg.in.h: Likewise.
* lib/stddef.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_file.in.h: Likewise.
* lib/sys_ioctl.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/sys_times.in.h: Likewise.
* lib/sys_utsname.in.h: Likewise.
* lib/sys_wait.in.h: Likewise.
* lib/sysexits.in.h: Likewise.
* lib/termios.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): Substitute @address@hidden
* modules/ctype (Makefile.am): Likewise.
* modules/dirent (Makefile.am): Likewise.
* modules/errno (Makefile.am): Likewise.
* modules/fcntl-h (Makefile.am): Likewise.
* modules/float (Makefile.am): Likewise.
* modules/getopt-posix (Makefile.am): Likewise.
* modules/iconv-h (Makefile.am): Likewise.
* modules/langinfo (Makefile.am): Likewise.
* modules/locale (Makefile.am): Likewise.
* modules/math (Makefile.am): Likewise.
* modules/netdb (Makefile.am): Likewise.
* modules/netinet_in (Makefile.am): Likewise.
* modules/poll-h (Makefile.am): Likewise.
* modules/pthread (Makefile.am): Likewise.
* modules/pty (Makefile.am): Likewise.
* modules/sched (Makefile.am): Likewise.
* modules/search (Makefile.am): Likewise.
* modules/selinux-h (Makefile.am): Likewise.
* modules/signal (Makefile.am): Likewise.
* modules/spawn (Makefile.am): Likewise.
* modules/stdarg (Makefile.am): Likewise.
* modules/stddef (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_file (Makefile.am): Likewise.
* modules/sys_ioctl (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/sys_times (Makefile.am): Likewise.
* modules/sys_utsname (Makefile.am): Likewise.
* modules/sys_wait (Makefile.am): Likewise.
* modules/sysexits (Makefile.am): Likewise.
* modules/termios (Makefile.am): Likewise.
* modules/time (Makefile.am): Likewise.
* modules/unistd (Makefile.am): Likewise.
* modules/wchar (Makefile.am): Likewise.
* modules/wctype (Makefile.am): Likewise.
--- gnulib-tool.orig Sun Nov 14 20:09:32 2010
+++ gnulib-tool Sun Nov 14 19:54:24 2010
@@ -2766,6 +2766,8 @@
# - po_domain prefix of i18n domain to use (without -gnulib suffix)
# - actioncmd (optional) command that will reproduce this invocation
# - for_test true if creating a package for testing, false otherwise
+# - sed_replace_include_guard_prefix
+# sed expression for resolving ${gl_include_guard_prefix}
# - destfile filename relative to destdir of makefile being generated
# Input/Output:
# - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val}
@@ -2827,7 +2829,8 @@
-e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
-e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
-e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
- -e "$sed_transform_check_PROGRAMS"
+ -e "$sed_transform_check_PROGRAMS" \
+ -e "$sed_replace_include_guard_prefix"
if test "$module" = 'alloca'; then
echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@"
@@ -3056,6 +3059,8 @@
# - macro_prefix prefix of gl_LIBOBJS macros to use
# - for_test true if creating a package for testing, false otherwise
# - use_libtests true if a libtests.a should be built, false otherwise
+# - sed_replace_include_guard_prefix
+# sed expression for resolving ${gl_include_guard_prefix}
# - destfile filename relative to destdir of makefile being generated
# Input/Output:
# - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val}
@@ -3104,7 +3109,8 @@
-e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \
-e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
-e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
- -e "$sed_transform_check_PROGRAMS"
+ -e "$sed_transform_check_PROGRAMS" \
+ -e "$sed_replace_include_guard_prefix"
if $use_libtests && test "$module" = 'alloca'; then
echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@"
echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@"
@@ -4160,6 +4166,14 @@
fi
func_append actioncmd " `echo $specified_modules`"
+ # Determine include_guard_prefix.
+ if test "$macro_prefix" = gl; then
+ include_guard_prefix='GL'
+ else
+ include_guard_prefix='GL_'`echo "$macro_prefix" | LC_ALL=C tr '[a-z]'
'[A-Z]'`
+ fi
+
sed_replace_include_guard_prefix='s/\${gl_include_guard_prefix}/'"${include_guard_prefix}"'/g'
+
# Default the makefile name to Makefile.am.
if test -n "$makefile_name"; then
makefile_am=$makefile_name
@@ -5022,6 +5036,14 @@
exec 0<&5 5<&-
}
+ # Determine include_guard_prefix.
+ if test "$macro_prefix" = gl; then
+ include_guard_prefix='GL'
+ else
+ include_guard_prefix='GL_'`echo "$macro_prefix" | LC_ALL=C tr '[a-z]'
'[A-Z]'`
+ fi
+
sed_replace_include_guard_prefix='s/\${gl_include_guard_prefix}/'"${include_guard_prefix}"'/g'
+
# Create Makefile.ams that are for testing.
for_test=true
--- lib/arpa_inet.in.h.orig Sun Nov 14 20:09:32 2010
+++ lib/arpa_inet.in.h Sun Nov 14 17:55:19 2010
@@ -16,7 +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. */
-#ifndef _GL_ARPA_INET_H
+#ifndef address@hidden@_ARPA_INET_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -37,8 +37,8 @@
#endif
-#ifndef _GL_ARPA_INET_H
-#define _GL_ARPA_INET_H
+#ifndef address@hidden@_ARPA_INET_H
+#define address@hidden@_ARPA_INET_H
/* The definition of _GL_ARG_NONNULL is copied here. */
@@ -94,5 +94,5 @@
}
#endif
-#endif /* _GL_ARPA_INET_H */
-#endif /* _GL_ARPA_INET_H */
+#endif /* address@hidden@_ARPA_INET_H */
+#endif /* address@hidden@_ARPA_INET_H */
--- lib/ctype.in.h.orig Sun Nov 14 20:09:32 2010
+++ lib/ctype.in.h Sun Nov 14 17:55:47 2010
@@ -23,7 +23,7 @@
* <http://www.opengroup.org/onlinepubs/9699919799/basedefs/ctype.h.html>
*/
-#ifndef _GL_CTYPE_H
+#ifndef address@hidden@_CTYPE_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -34,8 +34,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_CTYPE_H@
-#ifndef _GL_CTYPE_H
-#define _GL_CTYPE_H
+#ifndef address@hidden@_CTYPE_H
+#define address@hidden@_CTYPE_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -54,5 +54,5 @@
# endif
#endif
-#endif /* _GL_CTYPE_H */
-#endif /* _GL_CTYPE_H */
+#endif /* address@hidden@_CTYPE_H */
+#endif /* address@hidden@_CTYPE_H */
--- lib/dirent.in.h.orig Sun Nov 14 20:09:32 2010
+++ lib/dirent.in.h Sun Nov 14 17:56:19 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_DIRENT_H
+#ifndef address@hidden@_DIRENT_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -24,8 +24,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_DIRENT_H@
-#ifndef _GL_DIRENT_H
-#define _GL_DIRENT_H
+#ifndef address@hidden@_DIRENT_H
+#define address@hidden@_DIRENT_H
/* Get ino_t. Needed on some systems, including glibc 2.8. */
#include <sys/types.h>
@@ -168,5 +168,5 @@
#endif
-#endif /* _GL_DIRENT_H */
-#endif /* _GL_DIRENT_H */
+#endif /* address@hidden@_DIRENT_H */
+#endif /* address@hidden@_DIRENT_H */
--- lib/errno.in.h.orig Sun Nov 14 20:09:32 2010
+++ lib/errno.in.h Sun Nov 14 18:19:31 2010
@@ -16,7 +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. */
-#ifndef _GL_ERRNO_H
+#ifndef address@hidden@_ERRNO_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_ERRNO_H@
-#ifndef _GL_ERRNO_H
-#define _GL_ERRNO_H
+#ifndef address@hidden@_ERRNO_H
+#define address@hidden@_ERRNO_H
/* On native Windows platforms, many macros are not defined. */
@@ -163,5 +163,5 @@
# endif
-#endif /* _GL_ERRNO_H */
-#endif /* _GL_ERRNO_H */
+#endif /* address@hidden@_ERRNO_H */
+#endif /* address@hidden@_ERRNO_H */
--- lib/fcntl.in.h.orig Sun Nov 14 20:09:32 2010
+++ lib/fcntl.in.h Sun Nov 14 17:58:52 2010
@@ -40,7 +40,7 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_FCNTL_H
+#ifndef address@hidden@_FCNTL_H
#include <sys/types.h>
#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */
@@ -49,8 +49,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_FCNTL_H@
-#ifndef _GL_FCNTL_H
-#define _GL_FCNTL_H
+#ifndef address@hidden@_FCNTL_H
+#define address@hidden@_FCNTL_H
#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */
# include <unistd.h>
@@ -293,6 +293,6 @@
#endif
-#endif /* _GL_FCNTL_H */
-#endif /* _GL_FCNTL_H */
+#endif /* address@hidden@_FCNTL_H */
+#endif /* address@hidden@_FCNTL_H */
#endif
--- lib/float.in.h.orig Sun Nov 14 20:09:32 2010
+++ lib/float.in.h Sun Nov 14 18:19:55 2010
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_FLOAT_H
+#ifndef address@hidden@_FLOAT_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -25,8 +25,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_FLOAT_H@
-#ifndef _GL_FLOAT_H
-#define _GL_FLOAT_H
+#ifndef address@hidden@_FLOAT_H
+#define address@hidden@_FLOAT_H
/* 'long double' properties. */
#if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__)
@@ -59,5 +59,5 @@
# define LDBL_MAX_10_EXP 4932
#endif
-#endif /* _GL_FLOAT_H */
-#endif /* _GL_FLOAT_H */
+#endif /* address@hidden@_FLOAT_H */
+#endif /* address@hidden@_FLOAT_H */
--- lib/getopt.in.h.orig Sun Nov 14 20:09:32 2010
+++ lib/getopt.in.h Sun Nov 14 18:21:01 2010
@@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_GETOPT_H
+#ifndef address@hidden@_GETOPT_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -32,10 +32,10 @@
# undef _GL_SYSTEM_GETOPT
#endif
-#ifndef _GL_GETOPT_H
+#ifndef address@hidden@_GETOPT_H
#ifndef __need_getopt
-# define _GL_GETOPT_H 1
+# define address@hidden@_GETOPT_H 1
#endif
/* Standalone applications should #define __GETOPT_PREFIX to an
@@ -249,5 +249,5 @@
/* Make sure we later can get all the definitions and declarations. */
#undef __need_getopt
-#endif /* getopt.h */
-#endif /* getopt.h */
+#endif /* address@hidden@_GETOPT_H */
+#endif /* address@hidden@_GETOPT_H */
--- lib/iconv.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/iconv.in.h Sun Nov 14 18:21:22 2010
@@ -16,7 +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. */
-#ifndef _GL_ICONV_H
+#ifndef address@hidden@_ICONV_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_ICONV_H@
-#ifndef _GL_ICONV_H
-#define _GL_ICONV_H
+#ifndef address@hidden@_ICONV_H
+#define address@hidden@_ICONV_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -98,5 +98,5 @@
_GL_CXXALIASWARN (iconv_close);
-#endif /* _GL_ICONV_H */
-#endif /* _GL_ICONV_H */
+#endif /* address@hidden@_ICONV_H */
+#endif /* address@hidden@_ICONV_H */
--- lib/langinfo.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/langinfo.in.h Sun Nov 14 18:01:00 2010
@@ -20,7 +20,7 @@
* <http://www.opengroup.org/onlinepubs/9699919799/basedefs/langinfo.h.html>
*/
-#ifndef _GL_LANGINFO_H
+#ifndef address@hidden@_LANGINFO_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -32,8 +32,8 @@
# @INCLUDE_NEXT@ @NEXT_LANGINFO_H@
#endif
-#ifndef _GL_LANGINFO_H
-#define _GL_LANGINFO_H
+#ifndef address@hidden@_LANGINFO_H
+#define address@hidden@_LANGINFO_H
#if address@hidden@
@@ -173,5 +173,5 @@
#endif
-#endif /* _GL_LANGINFO_H */
-#endif /* _GL_LANGINFO_H */
+#endif /* address@hidden@_LANGINFO_H */
+#endif /* address@hidden@_LANGINFO_H */
--- lib/locale.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/locale.in.h Sun Nov 14 18:01:23 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_LOCALE_H
+#ifndef address@hidden@_LOCALE_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -24,8 +24,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_LOCALE_H@
-#ifndef _GL_LOCALE_H
-#define _GL_LOCALE_H
+#ifndef address@hidden@_LOCALE_H
+#define address@hidden@_LOCALE_H
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
@@ -71,5 +71,5 @@
# endif
#endif
-#endif /* _GL_LOCALE_H */
-#endif /* _GL_LOCALE_H */
+#endif /* address@hidden@_LOCALE_H */
+#endif /* address@hidden@_LOCALE_H */
--- lib/math.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/math.in.h Sun Nov 14 18:01:56 2010
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_MATH_H
+#ifndef address@hidden@_MATH_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -25,8 +25,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_AS_FIRST_DIRECTIVE_MATH_H@
-#ifndef _GL_MATH_H
-#define _GL_MATH_H
+#ifndef address@hidden@_MATH_H
+#define address@hidden@_MATH_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -754,5 +754,5 @@
#endif
-#endif /* _GL_MATH_H */
-#endif /* _GL_MATH_H */
+#endif /* address@hidden@_MATH_H */
+#endif /* address@hidden@_MATH_H */
--- lib/netdb.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/netdb.in.h Sun Nov 14 18:02:16 2010
@@ -20,7 +20,7 @@
It is intended to provide definitions and prototypes needed by an
application. */
-#ifndef _GL_NETDB_H
+#ifndef address@hidden@_NETDB_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -34,8 +34,8 @@
#endif
-#ifndef _GL_NETDB_H
-#define _GL_NETDB_H
+#ifndef address@hidden@_NETDB_H
+#define address@hidden@_NETDB_H
/* Get netdb.h definitions such as struct hostent for MinGW. */
#include <sys/socket.h>
@@ -220,5 +220,5 @@
#endif
-#endif /* _GL_NETDB_H */
-#endif /* _GL_NETDB_H */
+#endif /* address@hidden@_NETDB_H */
+#endif /* address@hidden@_NETDB_H */
--- lib/netinet_in.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/netinet_in.in.h Sun Nov 14 18:21:38 2010
@@ -15,7 +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. */
-#ifndef _GL_NETINET_IN_H
+#ifndef address@hidden@_NETINET_IN_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -33,8 +33,8 @@
#endif
-#ifndef _GL_NETINET_IN_H
-#define _GL_NETINET_IN_H
+#ifndef address@hidden@_NETINET_IN_H
+#define address@hidden@_NETINET_IN_H
#if address@hidden@
@@ -44,5 +44,5 @@
#endif
-#endif /* _GL_NETINET_IN_H */
-#endif /* _GL_NETINET_IN_H */
+#endif /* address@hidden@_NETINET_IN_H */
+#endif /* address@hidden@_NETINET_IN_H */
--- lib/poll.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/poll.in.h Sun Nov 14 18:02:43 2010
@@ -19,7 +19,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifndef _GL_POLL_H
+#ifndef address@hidden@_POLL_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -31,8 +31,8 @@
# @INCLUDE_NEXT@ @NEXT_POLL_H@
#endif
-#ifndef _GL_POLL_H
-#define _GL_POLL_H
+#ifndef address@hidden@_POLL_H
+#define address@hidden@_POLL_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -100,5 +100,5 @@
#endif
-#endif /* _GL_POLL_H */
-#endif /* _GL_POLL_H */
+#endif /* address@hidden@_POLL_H */
+#endif /* address@hidden@_POLL_H */
--- lib/pthread.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/pthread.in.h Sun Nov 14 18:21:59 2010
@@ -18,7 +18,7 @@
/* Written by Paul Eggert and Glen Lenker. */
-#ifndef _GL_PTHREAD_H_
+#ifndef address@hidden@_PTHREAD_H_
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -30,8 +30,8 @@
# @INCLUDE_NEXT@ @NEXT_PTHREAD_H@
#endif
-#ifndef _GL_PTHREAD_H_
-#define _GL_PTHREAD_H_
+#ifndef address@hidden@_PTHREAD_H_
+#define address@hidden@_PTHREAD_H_
#include <errno.h>
#include <stdlib.h>
@@ -270,5 +270,5 @@
#endif
-#endif /* _GL_PTHREAD_H_ */
-#endif /* _GL_PTHREAD_H_ */
+#endif /* address@hidden@_PTHREAD_H_ */
+#endif /* address@hidden@_PTHREAD_H_ */
--- lib/pty.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/pty.in.h Sun Nov 14 18:03:07 2010
@@ -15,7 +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. */
-#ifndef _GL_PTY_H
+#ifndef address@hidden@_PTY_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
# @INCLUDE_NEXT@ @NEXT_PTY_H@
#endif
-#ifndef _GL_PTY_H
-#define _GL_PTY_H
+#ifndef address@hidden@_PTY_H
+#define address@hidden@_PTY_H
/* Some platforms declare this in a different header than glibc. */
#if @HAVE_UTIL_H@
@@ -120,5 +120,5 @@
#endif
-#endif /* _GL_PTY_H */
-#endif /* _GL_PTY_H */
+#endif /* address@hidden@_PTY_H */
+#endif /* address@hidden@_PTY_H */
--- lib/sched.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/sched.in.h Sun Nov 14 18:22:14 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_SCHED_H
+#ifndef address@hidden@_SCHED_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
# @INCLUDE_NEXT@ @NEXT_SCHED_H@
#endif
-#ifndef _GL_SCHED_H
-#define _GL_SCHED_H
+#ifndef address@hidden@_SCHED_H
+#define address@hidden@_SCHED_H
#if address@hidden@
@@ -47,5 +47,5 @@
# define SCHED_OTHER 0
#endif
-#endif /* _GL_SCHED_H */
-#endif /* _GL_SCHED_H */
+#endif /* address@hidden@_SCHED_H */
+#endif /* address@hidden@_SCHED_H */
--- lib/se-selinux.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/se-selinux.in.h Sun Nov 14 18:25:16 2010
@@ -14,8 +14,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/>. */
-#ifndef _GL_SELINUX_SELINUX_H
-# define _GL_SELINUX_SELINUX_H
+#ifndef address@hidden@_SELINUX_SELINUX_H
+# define address@hidden@_SELINUX_SELINUX_H
# if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -94,4 +94,4 @@
# endif
# endif
-#endif /* _GL_SELINUX_SELINUX_H */
+#endif /* address@hidden@_SELINUX_SELINUX_H */
--- lib/search.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/search.in.h Sun Nov 14 18:03:36 2010
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_SEARCH_H
+#ifndef address@hidden@_SEARCH_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
# @INCLUDE_NEXT@ @NEXT_SEARCH_H@
#endif
-#ifndef _GL_SEARCH_H
-#define _GL_SEARCH_H
+#ifndef address@hidden@_SEARCH_H
+#define address@hidden@_SEARCH_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -203,5 +203,5 @@
#endif
-#endif /* _GL_SEARCH_H */
-#endif /* _GL_SEARCH_H */
+#endif /* address@hidden@_SEARCH_H */
+#endif /* address@hidden@_SEARCH_H */
--- lib/signal.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/signal.in.h Sun Nov 14 18:04:02 2010
@@ -28,13 +28,13 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_SIGNAL_H
+#ifndef address@hidden@_SIGNAL_H
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_SIGNAL_H@
-#ifndef _GL_SIGNAL_H
-#define _GL_SIGNAL_H
+#ifndef address@hidden@_SIGNAL_H
+#define address@hidden@_SIGNAL_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -349,6 +349,6 @@
#endif
-#endif /* _GL_SIGNAL_H */
-#endif /* _GL_SIGNAL_H */
+#endif /* address@hidden@_SIGNAL_H */
+#endif /* address@hidden@_SIGNAL_H */
#endif
--- lib/spawn.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/spawn.in.h Sun Nov 14 18:04:25 2010
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _GL_SPAWN_H
+#ifndef address@hidden@_SPAWN_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
# @INCLUDE_NEXT@ @NEXT_SPAWN_H@
#endif
-#ifndef _GL_SPAWN_H
-#define _GL_SPAWN_H
+#ifndef address@hidden@_SPAWN_H
+#define address@hidden@_SPAWN_H
/* Get definitions of 'struct sched_param' and 'sigset_t'.
But avoid namespace pollution on glibc systems. */
@@ -877,5 +877,5 @@
#endif
-#endif /* _GL_SPAWN_H */
-#endif /* _GL_SPAWN_H */
+#endif /* address@hidden@_SPAWN_H */
+#endif /* address@hidden@_SPAWN_H */
--- lib/stdarg.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/stdarg.in.h Sun Nov 14 18:22:27 2010
@@ -15,7 +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. */
-#ifndef _GL_STDARG_H
+#ifndef address@hidden@_STDARG_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -25,12 +25,12 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STDARG_H@
-#ifndef _GL_STDARG_H
-#define _GL_STDARG_H
+#ifndef address@hidden@_STDARG_H
+#define address@hidden@_STDARG_H
#ifndef va_copy
# define va_copy(a,b) ((a) = (b))
#endif
-#endif /* _GL_STDARG_H */
-#endif /* _GL_STDARG_H */
+#endif /* address@hidden@_STDARG_H */
+#endif /* address@hidden@_STDARG_H */
--- lib/stddef.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/stddef.in.h Sun Nov 14 18:23:27 2010
@@ -38,9 +38,9 @@
remember if special invocation has ever been used to obtain wint_t,
in which case we need to clean up NULL yet again. */
-# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined address@hidden@_STDDEF_H && defined _GL_STDDEF_WINT_T)
# ifdef __need_wint_t
-# undef _GL_STDDEF_H
+# undef address@hidden@_STDDEF_H
# define _GL_STDDEF_WINT_T
# endif
# @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -49,14 +49,14 @@
#else
/* Normal invocation convention. */
-# ifndef _GL_STDDEF_H
+# ifndef address@hidden@_STDDEF_H
/* The include_next requires a split double-inclusion guard. */
# @INCLUDE_NEXT@ @NEXT_STDDEF_H@
-# ifndef _GL_STDDEF_H
-# define _GL_STDDEF_H
+# ifndef address@hidden@_STDDEF_H
+# define address@hidden@_STDDEF_H
/* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */
#if @REPLACE_NULL@
@@ -82,6 +82,6 @@
# define wchar_t int
#endif
-# endif /* _GL_STDDEF_H */
-# endif /* _GL_STDDEF_H */
+# endif /* address@hidden@_STDDEF_H */
+# endif /* address@hidden@_STDDEF_H */
#endif /* __need_XXX */
--- lib/stdint.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/stdint.in.h Sun Nov 14 18:38:07 2010
@@ -21,7 +21,7 @@
* <http://www.opengroup.org/susv3xbd/stdint.h.html>
*/
-#ifndef _GL_STDINT_H
+#ifndef address@hidden@_STDINT_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -52,13 +52,13 @@
/* Other systems may have an incomplete or buggy <stdint.h>.
Include it before <inttypes.h>, since any "#include <stdint.h>"
in <inttypes.h> would reinclude us, skipping our contents because
- _GL_STDINT_H is defined.
+ address@hidden@_STDINT_H is defined.
The include_next requires a split double-inclusion guard. */
# @INCLUDE_NEXT@ @NEXT_STDINT_H@
#endif
-#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-#define _GL_STDINT_H
+#if ! defined address@hidden@_STDINT_H && ! defined
_GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define address@hidden@_STDINT_H
/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
@@ -572,5 +572,5 @@
#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
-#endif /* _GL_STDINT_H */
-#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
+#endif /* address@hidden@_STDINT_H */
+#endif /* !defined address@hidden@_STDINT_H && !defined
_GL_JUST_INCLUDE_SYSTEM_STDINT_H */
--- lib/stdio.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/stdio.in.h Sun Nov 14 18:04:49 2010
@@ -29,13 +29,13 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_STDIO_H
+#ifndef address@hidden@_STDIO_H
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STDIO_H@
-#ifndef _GL_STDIO_H
-#define _GL_STDIO_H
+#ifndef address@hidden@_STDIO_H
+#define address@hidden@_STDIO_H
/* Get va_list. Needed on many systems, including glibc 2.8. */
#include <stdarg.h>
@@ -1081,6 +1081,6 @@
#endif
-#endif /* _GL_STDIO_H */
-#endif /* _GL_STDIO_H */
+#endif /* address@hidden@_STDIO_H */
+#endif /* address@hidden@_STDIO_H */
#endif
--- lib/stdlib.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/stdlib.in.h Sun Nov 14 18:05:12 2010
@@ -28,13 +28,13 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_STDLIB_H
+#ifndef address@hidden@_STDLIB_H
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STDLIB_H@
-#ifndef _GL_STDLIB_H
-#define _GL_STDLIB_H
+#ifndef address@hidden@_STDLIB_H
+#define address@hidden@_STDLIB_H
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
@@ -717,6 +717,6 @@
#endif
-#endif /* _GL_STDLIB_H */
-#endif /* _GL_STDLIB_H */
+#endif /* address@hidden@_STDLIB_H */
+#endif /* address@hidden@_STDLIB_H */
#endif
--- lib/string.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/string.in.h Sun Nov 14 18:05:52 2010
@@ -16,7 +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. */
-#ifndef _GL_STRING_H
+#ifndef address@hidden@_STRING_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STRING_H@
-#ifndef _GL_STRING_H
-#define _GL_STRING_H
+#ifndef address@hidden@_STRING_H
+#define address@hidden@_STRING_H
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
@@ -971,5 +971,5 @@
#endif
-#endif /* _GL_STRING_H */
-#endif /* _GL_STRING_H */
+#endif /* address@hidden@_STRING_H */
+#endif /* address@hidden@_STRING_H */
--- lib/strings.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/strings.in.h Sun Nov 14 18:24:16 2010
@@ -16,7 +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. */
-#ifndef _GL_STRINGS_H
+#ifndef address@hidden@_STRINGS_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STRINGS_H@
-#ifndef _GL_STRINGS_H
-#define _GL_STRINGS_H
+#ifndef address@hidden@_STRINGS_H
+#define address@hidden@_STRINGS_H
/* The definition of _GL_ARG_NONNULL is copied here. */
@@ -90,5 +90,5 @@
}
#endif
-#endif /* _GL_STRING_H */
-#endif /* _GL_STRING_H */
+#endif /* address@hidden@_STRING_H */
+#endif /* address@hidden@_STRING_H */
--- lib/sys_file.in.h.orig Sun Nov 14 20:09:33 2010
+++ lib/sys_file.in.h Sun Nov 14 18:06:17 2010
@@ -18,7 +18,7 @@
/* Written by Richard W.M. Jones. */
-#ifndef _GL_SYS_FILE_H
+#ifndef address@hidden@_SYS_FILE_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -30,8 +30,8 @@
# @INCLUDE_NEXT@ @NEXT_SYS_FILE_H@
#endif
-#ifndef _GL_SYS_FILE_H
-#define _GL_SYS_FILE_H
+#ifndef address@hidden@_SYS_FILE_H
+#define address@hidden@_SYS_FILE_H
#ifndef LOCK_SH
/* Operations for the 'flock' call (same as Linux kernel constants). */
@@ -60,5 +60,5 @@
#endif
-#endif /* _GL_SYS_FILE_H */
-#endif /* _GL_SYS_FILE_H */
+#endif /* address@hidden@_SYS_FILE_H */
+#endif /* address@hidden@_SYS_FILE_H */
--- lib/sys_ioctl.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_ioctl.in.h Sun Nov 14 18:06:41 2010
@@ -15,7 +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. */
-#ifndef _GL_SYS_IOCTL_H
+#ifndef address@hidden@_SYS_IOCTL_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
# @INCLUDE_NEXT@ @NEXT_SYS_IOCTL_H@
#endif
-#ifndef _GL_SYS_IOCTL_H
-#define _GL_SYS_IOCTL_H
+#ifndef address@hidden@_SYS_IOCTL_H
+#define address@hidden@_SYS_IOCTL_H
/* AIX 5.1 and Solaris 10 declare ioctl() in <unistd.h> and in <stropts.h>,
but not in <sys/ioctl.h>.
@@ -75,5 +75,5 @@
#endif
-#endif /* _GL_SYS_IOCTL_H */
-#endif /* _GL_SYS_IOCTL_H */
+#endif /* address@hidden@_SYS_IOCTL_H */
+#endif /* address@hidden@_SYS_IOCTL_H */
--- lib/sys_select.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_select.in.h Sun Nov 14 18:07:10 2010
@@ -34,7 +34,7 @@
#else
-#ifndef _GL_SYS_SELECT_H
+#ifndef address@hidden@_SYS_SELECT_H
#if @HAVE_SYS_SELECT_H@
@@ -62,8 +62,8 @@
#endif
-#ifndef _GL_SYS_SELECT_H
-#define _GL_SYS_SELECT_H
+#ifndef address@hidden@_SYS_SELECT_H
+#define address@hidden@_SYS_SELECT_H
#if address@hidden@ || @REPLACE_SELECT@
/* A platform that lacks <sys/select.h>. */
@@ -102,6 +102,6 @@
#endif
-#endif /* _GL_SYS_SELECT_H */
-#endif /* _GL_SYS_SELECT_H */
+#endif /* address@hidden@_SYS_SELECT_H */
+#endif /* address@hidden@_SYS_SELECT_H */
#endif /* OSF/1 */
--- lib/sys_socket.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_socket.in.h Sun Nov 14 18:46:06 2010
@@ -40,7 +40,7 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_SYS_SOCKET_H
+#ifndef address@hidden@_SYS_SOCKET_H
#if @HAVE_SYS_SOCKET_H@
@@ -57,8 +57,8 @@
#endif
-#ifndef _GL_SYS_SOCKET_H
-#define _GL_SYS_SOCKET_H
+#ifndef address@hidden@_SYS_SOCKET_H
+#define address@hidden@_SYS_SOCKET_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -198,7 +198,7 @@
/* Wrap everything else to use libc file descriptors for sockets. */
-#if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+#if @HAVE_WINSOCK2_H@ && !defined address@hidden@_UNISTD_H
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef close
# define close close_used_without_including_unistd_h
@@ -208,7 +208,7 @@
# endif
#endif
-#if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+#if @HAVE_WINSOCK2_H@ && !defined address@hidden@_UNISTD_H
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef gethostname
# define gethostname gethostname_used_without_including_unistd_h
@@ -639,6 +639,6 @@
# endif
#endif
-#endif /* _GL_SYS_SOCKET_H */
-#endif /* _GL_SYS_SOCKET_H */
+#endif /* address@hidden@_SYS_SOCKET_H */
+#endif /* address@hidden@_SYS_SOCKET_H */
#endif
--- lib/sys_stat.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_stat.in.h Sun Nov 14 18:07:59 2010
@@ -34,7 +34,7 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_SYS_STAT_H
+#ifndef address@hidden@_SYS_STAT_H
/* Get nlink_t. */
#include <sys/types.h>
@@ -45,8 +45,8 @@
/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_SYS_STAT_H@
-#ifndef _GL_SYS_STAT_H
-#define _GL_SYS_STAT_H
+#ifndef address@hidden@_SYS_STAT_H
+#define address@hidden@_SYS_STAT_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -640,6 +640,6 @@
#endif
-#endif /* _GL_SYS_STAT_H */
-#endif /* _GL_SYS_STAT_H */
+#endif /* address@hidden@_SYS_STAT_H */
+#endif /* address@hidden@_SYS_STAT_H */
#endif
--- lib/sys_time.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_time.in.h Sun Nov 14 18:08:35 2010
@@ -23,7 +23,7 @@
#endif
@PRAGMA_COLUMNS@
-#if defined _GL_SYS_TIME_H
+#if defined address@hidden@_SYS_TIME_H
/* Simply delegate to the system's header, without adding anything. */
# if @HAVE_SYS_TIME_H@
@@ -32,7 +32,7 @@
#else
-# define _GL_SYS_TIME_H
+# define address@hidden@_SYS_TIME_H
# if @HAVE_SYS_TIME_H@
# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
@@ -98,4 +98,4 @@
# endif
# endif
-#endif /* _GL_SYS_TIME_H */
+#endif /* address@hidden@_SYS_TIME_H */
--- lib/sys_times.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_times.in.h Sun Nov 14 18:08:52 2010
@@ -20,7 +20,7 @@
/* This file is supposed to be used on platforms where <sys/times.h>
is missing. */
-#ifndef _GL_SYS_TIMES_H
+#ifndef address@hidden@_SYS_TIMES_H
# if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -31,7 +31,7 @@
# @INCLUDE_NEXT@ @NEXT_SYS_TIMES_H@
# endif
-# define _GL_SYS_TIMES_H
+# define address@hidden@_SYS_TIMES_H
/* Get clock_t.
But avoid namespace pollution on glibc systems. */
@@ -78,4 +78,4 @@
}
# endif
-#endif /* _GL_SYS_TIMES_H */
+#endif /* address@hidden@_SYS_TIMES_H */
--- lib/sys_utsname.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_utsname.in.h Sun Nov 14 18:09:10 2010
@@ -15,7 +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. */
-#ifndef _GL_SYS_UTSNAME_H
+#ifndef address@hidden@_SYS_UTSNAME_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -26,7 +26,7 @@
# @INCLUDE_NEXT@ @NEXT_SYS_UTSNAME_H@
#endif
-#define _GL_SYS_UTSNAME_H
+#define address@hidden@_SYS_UTSNAME_H
/* The definition of _GL_ARG_NONNULL is copied here. */
@@ -98,4 +98,4 @@
#endif
-#endif /* _GL_SYS_UTSNAME_H */
+#endif /* address@hidden@_SYS_UTSNAME_H */
--- lib/sys_wait.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sys_wait.in.h Sun Nov 14 18:09:30 2010
@@ -16,7 +16,7 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifndef _GL_SYS_WAIT_H
+#ifndef address@hidden@_SYS_WAIT_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -28,8 +28,8 @@
# @INCLUDE_NEXT@ @NEXT_SYS_WAIT_H@
#endif
-#ifndef _GL_SYS_WAIT_H
-#define _GL_SYS_WAIT_H
+#ifndef address@hidden@_SYS_WAIT_H
+#define address@hidden@_SYS_WAIT_H
/* Get pid_t. */
#include <sys/types.h>
@@ -132,5 +132,5 @@
}
#endif
-#endif /* _GL_SYS_WAIT_H */
-#endif /* _GL_SYS_WAIT_H */
+#endif /* address@hidden@_SYS_WAIT_H */
+#endif /* address@hidden@_SYS_WAIT_H */
--- lib/sysexits.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/sysexits.in.h Sun Nov 14 18:24:36 2010
@@ -16,7 +16,7 @@
/* Written by Simon Josefsson based on sysexits(3) man page */
-#ifndef _GL_SYSEXITS_H
+#ifndef address@hidden@_SYSEXITS_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -43,8 +43,8 @@
#endif
-#ifndef _GL_SYSEXITS_H
-#define _GL_SYSEXITS_H
+#ifndef address@hidden@_SYSEXITS_H
+#define address@hidden@_SYSEXITS_H
#if address@hidden@
@@ -68,5 +68,5 @@
#endif
-#endif /* _GL_SYSEXITS_H */
-#endif /* _GL_SYSEXITS_H */
+#endif /* address@hidden@_SYSEXITS_H */
+#endif /* address@hidden@_SYSEXITS_H */
--- lib/termios.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/termios.in.h Sun Nov 14 18:09:49 2010
@@ -15,7 +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. */
-#ifndef _GL_TERMIOS_H
+#ifndef address@hidden@_TERMIOS_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
# @INCLUDE_NEXT@ @NEXT_TERMIOS_H@
#endif
-#ifndef _GL_TERMIOS_H
-#define _GL_TERMIOS_H
+#ifndef address@hidden@_TERMIOS_H
+#define address@hidden@_TERMIOS_H
#if @GNULIB_TCGETSID@
/* Get pid_t. */
@@ -61,5 +61,5 @@
#endif
-#endif /* _GL_TERMIOS_H */
-#endif /* _GL_TERMIOS_H */
+#endif /* address@hidden@_TERMIOS_H */
+#endif /* address@hidden@_TERMIOS_H */
--- lib/time.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/time.in.h Sun Nov 14 18:10:26 2010
@@ -28,13 +28,13 @@
without adding our own declarations. */
#if (defined __need_time_t || defined __need_clock_t \
|| defined __need_timespec \
- || defined _GL_TIME_H)
+ || defined address@hidden@_TIME_H)
# @INCLUDE_NEXT@ @NEXT_TIME_H@
#else
-# define _GL_TIME_H
+# define address@hidden@_TIME_H
# @INCLUDE_NEXT@ @NEXT_TIME_H@
--- lib/unistd.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/unistd.in.h Sun Nov 14 18:45:32 2010
@@ -36,7 +36,7 @@
# define _GL_WINSOCK2_H_WITNESS
/* Normal invocation. */
-#elif !defined _GL_UNISTD_H
+#elif !defined address@hidden@_UNISTD_H
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_UNISTD_H@
@@ -51,8 +51,8 @@
# undef _GL_INCLUDING_WINSOCK2_H
#endif
-#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
-#define _GL_UNISTD_H
+#if !defined address@hidden@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
+#define address@hidden@_UNISTD_H
/* NetBSD 5.0 mis-defines NULL. Also get size_t. */
#include <stddef.h>
@@ -110,7 +110,7 @@
#if @GNULIB_GETHOSTNAME@
/* Get all possible declarations of gethostname(). */
# if @UNISTD_H_HAVE_WINSOCK2_H@
-# if !defined _GL_SYS_SOCKET_H
+# if !defined address@hidden@_SYS_SOCKET_H
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef socket
# define socket socket_used_without_including_sys_socket_h
@@ -171,7 +171,7 @@
"shutdown() used without including <sys/socket.h>");
# endif
# endif
-# if !defined _GL_SYS_SELECT_H
+# if !defined address@hidden@_SYS_SELECT_H
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef select
# define select select_used_without_including_sys_select_h
@@ -1328,5 +1328,5 @@
#endif
-#endif /* _GL_UNISTD_H */
-#endif /* _GL_UNISTD_H */
+#endif /* address@hidden@_UNISTD_H */
+#endif /* address@hidden@_UNISTD_H */
--- lib/wchar.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/wchar.in.h Sun Nov 14 18:12:03 2010
@@ -49,7 +49,7 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_WCHAR_H
+#ifndef address@hidden@_WCHAR_H
#define _GL_ALREADY_INCLUDING_WCHAR_H
@@ -73,8 +73,8 @@
#undef _GL_ALREADY_INCLUDING_WCHAR_H
-#ifndef _GL_WCHAR_H
-#define _GL_WCHAR_H
+#ifndef address@hidden@_WCHAR_H
+#define address@hidden@_WCHAR_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -426,6 +426,6 @@
#endif
-#endif /* _GL_WCHAR_H */
-#endif /* _GL_WCHAR_H */
+#endif /* address@hidden@_WCHAR_H */
+#endif /* address@hidden@_WCHAR_H */
#endif
--- lib/wctype.in.h.orig Sun Nov 14 20:09:34 2010
+++ lib/wctype.in.h Sun Nov 14 18:24:53 2010
@@ -26,7 +26,7 @@
* wctrans_t, and wctype_t are not yet implemented.
*/
-#ifndef _GL_WCTYPE_H
+#ifndef address@hidden@_WCTYPE_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@ -52,8 +52,8 @@
# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
#endif
-#ifndef _GL_WCTYPE_H
-#define _GL_WCTYPE_H
+#ifndef address@hidden@_WCTYPE_H
+#define address@hidden@_WCTYPE_H
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -394,5 +394,5 @@
_GL_CXXALIASWARN (towupper);
-#endif /* _GL_WCTYPE_H */
-#endif /* _GL_WCTYPE_H */
+#endif /* address@hidden@_WCTYPE_H */
+#endif /* address@hidden@_WCTYPE_H */
--- modules/arpa_inet.orig Sun Nov 14 20:09:34 2010
+++ modules/arpa_inet Sun Nov 14 18:54:11 2010
@@ -24,7 +24,8 @@
$(AM_V_at)$(MKDIR_P) arpa
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \
--- modules/ctype.orig Sun Nov 14 20:09:34 2010
+++ modules/ctype Sun Nov 14 19:27:58 2010
@@ -21,7 +21,8 @@
ctype.h: ctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_CTYPE_H''@|$(NEXT_CTYPE_H)|g' \
--- modules/dirent.orig Sun Nov 14 20:09:34 2010
+++ modules/dirent Sun Nov 14 19:28:03 2010
@@ -23,7 +23,8 @@
dirent.h: dirent.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
--- modules/errno.orig Sun Nov 14 20:09:34 2010
+++ modules/errno Sun Nov 14 19:28:07 2010
@@ -19,7 +19,8 @@
errno.h: errno.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
--- modules/fcntl-h.orig Sun Nov 14 20:09:34 2010
+++ modules/fcntl-h Sun Nov 14 19:28:41 2010
@@ -25,7 +25,8 @@
fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
--- modules/float.orig Sun Nov 14 20:09:34 2010
+++ modules/float Sun Nov 14 19:32:31 2010
@@ -19,7 +19,8 @@
float.h: float.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
--- modules/getopt-posix.orig Sun Nov 14 20:09:34 2010
+++ modules/getopt-posix Sun Nov 14 19:32:31 2010
@@ -26,7 +26,8 @@
getopt.h: getopt.in.h $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/iconv-h.orig Sun Nov 14 20:09:34 2010
+++ modules/iconv-h Sun Nov 14 19:32:31 2010
@@ -22,7 +22,8 @@
iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
--- modules/langinfo.orig Sun Nov 14 20:09:34 2010
+++ modules/langinfo Sun Nov 14 19:32:31 2010
@@ -22,7 +22,8 @@
langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/locale.orig Sun Nov 14 20:09:34 2010
+++ modules/locale Sun Nov 14 19:32:31 2010
@@ -24,7 +24,8 @@
locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
--- modules/math.orig Sun Nov 14 20:09:34 2010
+++ modules/math Sun Nov 14 19:32:31 2010
@@ -22,7 +22,8 @@
math.h: math.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e
's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e
's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e
's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \
--- modules/netdb.orig Sun Nov 14 20:09:34 2010
+++ modules/netdb Sun Nov 14 19:32:31 2010
@@ -23,7 +23,8 @@
netdb.h: netdb.in.h $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \
--- modules/netinet_in.orig Sun Nov 14 20:09:34 2010
+++ modules/netinet_in Sun Nov 14 19:32:31 2010
@@ -22,7 +22,8 @@
$(AM_V_at)$(MKDIR_P) netinet
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
--- modules/poll-h.orig Sun Nov 14 20:09:34 2010
+++ modules/poll-h Sun Nov 14 19:32:32 2010
@@ -22,7 +22,8 @@
poll.h: poll.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/pthread.orig Sun Nov 14 20:09:34 2010
+++ modules/pthread Sun Nov 14 19:32:31 2010
@@ -20,7 +20,8 @@
pthread.h: pthread.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/pty.orig Sun Nov 14 20:09:34 2010
+++ modules/pty Sun Nov 14 19:32:31 2010
@@ -21,7 +21,8 @@
pty.h: pty.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/sched.orig Sun Nov 14 20:09:34 2010
+++ modules/sched Sun Nov 14 19:32:31 2010
@@ -19,7 +19,8 @@
sched.h: sched.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/search.orig Sun Nov 14 20:09:34 2010
+++ modules/search Sun Nov 14 19:32:32 2010
@@ -22,7 +22,8 @@
search.h: search.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/selinux-h.orig Sun Nov 14 20:09:34 2010
+++ modules/selinux-h Sun Nov 14 19:33:46 2010
@@ -25,7 +25,8 @@
$(AM_V_at)$(MKDIR_P) selinux
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SELINUX_SELINUX_H''@|$(NEXT_SELINUX_SELINUX_H)|g' \
--- modules/signal.orig Sun Nov 14 20:09:34 2010
+++ modules/signal Sun Nov 14 19:32:32 2010
@@ -22,7 +22,8 @@
signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
--- modules/spawn.orig Sun Nov 14 20:09:34 2010
+++ modules/spawn Sun Nov 14 19:32:32 2010
@@ -23,7 +23,8 @@
spawn.h: spawn.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/stdarg.orig Sun Nov 14 20:09:34 2010
+++ modules/stdarg Sun Nov 14 19:32:32 2010
@@ -26,7 +26,8 @@
stdarg.h: stdarg.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
--- modules/stddef.orig Sun Nov 14 20:09:34 2010
+++ modules/stddef Sun Nov 14 19:32:32 2010
@@ -20,7 +20,8 @@
stddef.h: stddef.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
--- modules/stdint.orig Sun Nov 14 20:09:34 2010
+++ modules/stdint Sun Nov 14 19:32:32 2010
@@ -27,7 +27,8 @@
stdint.h: stdint.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/stdio.orig Sun Nov 14 20:09:34 2010
+++ modules/stdio Sun Nov 14 19:32:32 2010
@@ -26,7 +26,8 @@
stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
--- modules/stdlib.orig Sun Nov 14 20:09:34 2010
+++ modules/stdlib Sun Nov 14 19:32:32 2010
@@ -25,7 +25,8 @@
stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
--- modules/string.orig Sun Nov 14 20:09:34 2010
+++ modules/string Sun Nov 14 19:32:32 2010
@@ -24,7 +24,8 @@
string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
--- modules/strings.orig Sun Nov 14 20:09:35 2010
+++ modules/strings Sun Nov 14 19:32:32 2010
@@ -21,7 +21,8 @@
strings.h: strings.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
--- modules/sys_file.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_file Sun Nov 14 19:32:32 2010
@@ -22,7 +22,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/sys_ioctl.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_ioctl Sun Nov 14 19:32:32 2010
@@ -24,7 +24,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/sys_select.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_select Sun Nov 14 19:32:32 2010
@@ -25,7 +25,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
--- modules/sys_socket.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_socket Sun Nov 14 19:32:32 2010
@@ -28,7 +28,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
--- modules/sys_stat.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_stat Sun Nov 14 19:32:32 2010
@@ -26,7 +26,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
--- modules/sys_time.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_time Sun Nov 14 19:32:32 2010
@@ -24,7 +24,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/sys_times.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_times Sun Nov 14 19:32:32 2010
@@ -23,7 +23,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/sys_utsname.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_utsname Sun Nov 14 19:32:32 2010
@@ -23,7 +23,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/sys_wait.orig Sun Nov 14 20:09:35 2010
+++ modules/sys_wait Sun Nov 14 19:32:32 2010
@@ -23,7 +23,8 @@
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
--- modules/sysexits.orig Sun Nov 14 20:09:35 2010
+++ modules/sysexits Sun Nov 14 19:32:32 2010
@@ -19,7 +19,8 @@
sysexits.h: sysexits.in.h
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/termios.orig Sun Nov 14 20:09:35 2010
+++ modules/termios Sun Nov 14 19:32:32 2010
@@ -21,7 +21,8 @@
termios.h: termios.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \
--- modules/time.orig Sun Nov 14 20:09:35 2010
+++ modules/time Sun Nov 14 19:33:12 2010
@@ -24,7 +24,8 @@
time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
--- modules/unistd.orig Sun Nov 14 20:09:35 2010
+++ modules/unistd Sun Nov 14 19:32:32 2010
@@ -23,7 +23,8 @@
unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
--- modules/wchar.orig Sun Nov 14 20:09:35 2010
+++ modules/wchar Sun Nov 14 19:32:32 2010
@@ -24,7 +24,8 @@
wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
--- modules/wctype.orig Sun Nov 14 20:09:35 2010
+++ modules/wctype Sun Nov 14 19:32:32 2010
@@ -22,7 +22,8 @@
wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \