Eric Blake wrote:
> Personally, I don't mind a two-pronged approach:
>
> Lines less than 80 columns are nicer in my opinion, and we might as well
> do that whether or not -Wcolumns is in effect when the end result looks
> nicer. But I agree with Bruno that some lines should not be broken, as
> breaking them makes them less readable, and that we shouldn't have to
> worry about whether a particular commit is going to resurrect the
> problem. Therefore, using the #pragma will make the code immune to
> column width, whether or not we also reduce line length.
Thanks for your opinion (or may I say: arbitration).
With this, and silence from Jim and Simon, I'm committing this fix. With
a consistent idiom across all 44 .in.h files.
lib/regex.h is not handled by this patch. For this file, we will have the
choice: either keep the line lengths bounded, or convert it to a .in.h as well.
2010-10-04 Bruno Haible <br...@clisp.org>
Avoid line length limitation from HP NonStop system header files.
* m4/include_next.m4 (gl_INCLUDE_NEXT): Define also PRAGMA_COLUMNS.
* lib/arpa_inet.in.h: Use PRAGMA_COLUMNS.
* 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/inttypes.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 PRAGMA_COLUMNS.
* 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/inttypes (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.
*** m4/include_next.m4.orig Mon Oct 4 23:31:20 2010
--- m4/include_next.m4 Mon Oct 4 23:17:08 2010
***************
*** 1,4 ****
! # include_next.m4 serial 15
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # include_next.m4 serial 16
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
***************
*** 24,29 ****
--- 24,36 ----
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__'.
+ dnl
+ dnl PRAGMA_COLUMNS can be used in files that override system header files, so
+ dnl as to avoid compilation errors on HP NonStop systems when the gnulib file
+ dnl is included by a system header file that does a "#pragma COLUMNS 80"
(which
+ dnl has the effect of truncating the lines of that file and all files that it
+ dnl includes to 80 columns) and the gnulib file has lines longer than 80
+ dnl columns.
AC_DEFUN([gl_INCLUDE_NEXT],
[
***************
*** 98,103 ****
--- 105,128 ----
AC_SUBST([INCLUDE_NEXT])
AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
AC_SUBST([PRAGMA_SYSTEM_HEADER])
+ AC_CACHE_CHECK([whether system header files limit the line length],
+ [gl_cv_pragma_columns],
+ [dnl HP NonStop systems, which define __TANDEM, have this misfeature.
+ AC_EGREP_CPP([choke me],
+ [
+ #ifdef __TANDEM
+ choke me
+ #endif
+ ],
+ [gl_cv_pragma_columns=yes],
+ [gl_cv_pragma_columns=no])
+ ])
+ if test $gl_cv_pragma_columns = yes; then
+ PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+ else
+ PRAGMA_COLUMNS=
+ fi
+ AC_SUBST([PRAGMA_COLUMNS])
])
# gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
*** lib/arpa_inet.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/arpa_inet.in.h Mon Oct 4 23:17:08 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc
under MinGW.
*** lib/ctype.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/ctype.in.h Mon Oct 4 23:17:08 2010
***************
*** 28,33 ****
--- 28,34 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* Include the original <ctype.h>. */
/* The include_next requires a split double-inclusion guard. */
*** lib/dirent.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/dirent.in.h Mon Oct 4 23:25:31 2010
***************
*** 19,24 ****
--- 19,25 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_DIRENT_H@
*** lib/errno.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/errno.in.h Mon Oct 4 23:25:31 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_ERRNO_H@
*** lib/fcntl.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/fcntl.in.h Mon Oct 4 23:25:31 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined __need_system_fcntl_h
/* Special invocation convention. */
*** lib/float.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/float.in.h Mon Oct 4 23:25:31 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_FLOAT_H@
*** lib/getopt.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/getopt.in.h Mon Oct 4 23:25:31 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. We must
also inform the replacement unistd.h to not recursively use
*** lib/iconv.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/iconv.in.h Mon Oct 4 23:25:31 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_ICONV_H@
*** lib/inttypes.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/inttypes.in.h Mon Oct 4 23:25:31 2010
***************
*** 23,28 ****
--- 23,29 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* Include the original <inttypes.h> if it exists, and if this file
has not been included yet or if this file includes gnulib stdint.h
*** lib/langinfo.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/langinfo.in.h Mon Oct 4 23:25:31 2010
***************
*** 25,30 ****
--- 25,31 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_LANGINFO_H@
*** lib/locale.in.h.orig Mon Oct 4 23:31:18 2010
--- lib/locale.in.h Mon Oct 4 23:17:08 2010
***************
*** 19,24 ****
--- 19,25 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_LOCALE_H@
*** lib/math.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/math.in.h Mon Oct 4 23:17:08 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next_as_first_directive@ @NEXT_AS_FIRST_DIRECTIVE_MATH_H@
*** lib/netdb.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/netdb.in.h Mon Oct 4 23:25:31 2010
***************
*** 25,30 ****
--- 25,31 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if @HAVE_NETDB_H@
*** lib/netinet_in.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/netinet_in.in.h Mon Oct 4 23:17:08 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if @HAVE_NETINET_IN_H@
*** lib/poll.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/poll.in.h Mon Oct 4 23:25:31 2010
***************
*** 24,29 ****
--- 24,30 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_POLL_H@
*** lib/pthread.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/pthread.in.h Mon Oct 4 23:25:31 2010
***************
*** 23,28 ****
--- 23,29 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_PTHREAD_H@
*** lib/pty.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/pty.in.h Mon Oct 4 23:25:31 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_PTY_H@
*** lib/sched.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/sched.in.h Mon Oct 4 23:17:08 2010
***************
*** 19,24 ****
--- 19,25 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SCHED_H@
*** lib/se-selinux.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/se-selinux.in.h Mon Oct 4 23:25:32 2010
***************
*** 20,25 ****
--- 20,26 ----
# if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
# endif
+ @PRAGMA_COLUMNS@
# if HAVE_SELINUX_SELINUX_H
*** lib/search.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/search.in.h Mon Oct 4 23:25:31 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SEARCH_H@
*** lib/signal.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/signal.in.h Mon Oct 4 23:17:08 2010
***************
*** 18,23 ****
--- 18,24 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined __need_sig_atomic_t || defined __need_sigset_t
/* Special invocation convention inside glibc header files. */
*** lib/spawn.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/spawn.in.h Mon Oct 4 23:17:08 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SPAWN_H@
*** lib/stdarg.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/stdarg.in.h Mon Oct 4 23:17:08 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_STDARG_H@
*** lib/stddef.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/stddef.in.h Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined __need_wchar_t || defined __need_size_t \
|| defined __need_ptrdiff_t || defined __need_NULL \
*** lib/stdint.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/stdint.in.h Mon Oct 4 23:25:32 2010
***************
*** 26,31 ****
--- 26,32 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* When including a system file that in turn includes <inttypes.h>,
use the system <inttypes.h>, not our substitute. This avoids
*** lib/stdio.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/stdio.in.h Mon Oct 4 23:17:08 2010
***************
*** 19,24 ****
--- 19,25 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined __need_FILE || defined __need___FILE
/* Special invocation convention inside glibc header files. */
*** lib/stdlib.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/stdlib.in.h Mon Oct 4 23:17:08 2010
***************
*** 18,23 ****
--- 18,24 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined __need_malloc_and_calloc
/* Special invocation convention inside glibc header files. */
*** lib/string.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/string.in.h Mon Oct 4 23:17:08 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_STRING_H@
*** lib/strings.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/strings.in.h Mon Oct 4 23:25:32 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_STRINGS_H@
*** lib/sys_file.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/sys_file.in.h Mon Oct 4 23:25:32 2010
***************
*** 23,28 ****
--- 23,29 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SYS_FILE_H@
*** lib/sys_ioctl.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/sys_ioctl.in.h Mon Oct 4 23:25:32 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SYS_IOCTL_H@
*** lib/sys_select.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/sys_select.in.h Mon Oct 4 23:25:32 2010
***************
*** 18,23 ****
--- 18,24 ----
# if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
# endif
+ @PRAGMA_COLUMNS@
/* On OSF/1, <sys/types.h> and <sys/time.h> include <sys/select.h>.
Simply delegate to the system's header in this case. */
*** lib/sys_socket.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/sys_socket.in.h Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H
/* Special invocation convention:
*** lib/sys_stat.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/sys_stat.in.h Mon Oct 4 23:17:08 2010
***************
*** 24,29 ****
--- 24,30 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined __need_system_sys_stat_h
/* Special invocation convention. */
*** lib/sys_time.in.h.orig Mon Oct 4 23:31:19 2010
--- lib/sys_time.in.h Mon Oct 4 23:17:08 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined _GL_SYS_TIME_H
*** lib/sys_times.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/sys_times.in.h Mon Oct 4 23:25:32 2010
***************
*** 25,30 ****
--- 25,31 ----
# if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
# endif
+ @PRAGMA_COLUMNS@
# if @HAVE_SYS_TIMES_H@
# @INCLUDE_NEXT@ @NEXT_SYS_TIMES_H@
*** lib/sys_utsname.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/sys_utsname.in.h Mon Oct 4 23:25:32 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if @HAVE_SYS_UTSNAME_H@
# @INCLUDE_NEXT@ @NEXT_SYS_UTSNAME_H@
*** lib/sys_wait.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/sys_wait.in.h Mon Oct 4 23:17:08 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
*** lib/sysexits.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/sysexits.in.h Mon Oct 4 23:25:32 2010
***************
*** 21,26 ****
--- 21,27 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if @HAVE_SYSEXITS_H@
*** lib/termios.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/termios.in.h Mon Oct 4 23:25:32 2010
***************
*** 20,25 ****
--- 20,26 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#...@include_next@ @NEXT_TERMIOS_H@
*** lib/time.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/time.in.h Mon Oct 4 23:17:08 2010
***************
*** 19,24 ****
--- 19,25 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* 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
*** lib/unistd.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/unistd.in.h Mon Oct 4 23:25:32 2010
***************
*** 18,23 ****
--- 18,24 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
/* Special invocation convention:
- On mingw, several headers, including <winsock2.h>, include <unistd.h>,
*** lib/wchar.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/wchar.in.h Mon Oct 4 23:17:08 2010
***************
*** 29,34 ****
--- 29,35 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux &&
((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined
_GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
/* Special invocation convention:
*** lib/wctype.in.h.orig Mon Oct 4 23:31:20 2010
--- lib/wctype.in.h Mon Oct 4 23:25:32 2010
***************
*** 31,36 ****
--- 31,37 ----
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+ @PRAGMA_COLUMNS@
#if @HAVE_WINT_T@
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
*** modules/arpa_inet.orig Mon Oct 4 23:31:20 2010
--- modules/arpa_inet Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|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' \
*** modules/ctype.orig Mon Oct 4 23:31:20 2010
--- modules/ctype Mon Oct 4 23:17:08 2010
***************
*** 23,28 ****
--- 23,29 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_CTYPE_H''@|$(NEXT_CTYPE_H)|g' \
-e 's/@''GNULIB_ISBLANK''@/$(GNULIB_ISBLANK)/g' \
-e 's/@''HAVE_ISBLANK''@/$(HAVE_ISBLANK)/g' \
*** modules/dirent.orig Mon Oct 4 23:31:20 2010
--- modules/dirent Mon Oct 4 23:25:28 2010
***************
*** 25,30 ****
--- 25,31 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
-e 's|@''GNULIB_DIRFD''@|$(GNULIB_DIRFD)|g' \
-e 's|@''GNULIB_FDOPENDIR''@|$(GNULIB_FDOPENDIR)|g' \
*** modules/errno.orig Mon Oct 4 23:31:20 2010
--- modules/errno Mon Oct 4 23:25:28 2010
***************
*** 21,26 ****
--- 21,27 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
-e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
-e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
*** modules/fcntl-h.orig Mon Oct 4 23:31:20 2010
--- modules/fcntl-h Mon Oct 4 23:25:28 2010
***************
*** 27,32 ****
--- 27,33 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
-e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
*** modules/float.orig Mon Oct 4 23:31:20 2010
--- modules/float Mon Oct 4 23:25:28 2010
***************
*** 21,26 ****
--- 21,27 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
< $(srcdir)/float.in.h; \
} > $...@-t && \
*** modules/getopt-posix.orig Mon Oct 4 23:31:20 2010
--- modules/getopt-posix Mon Oct 4 23:25:28 2010
***************
*** 29,34 ****
--- 29,35 ----
sed -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' \
-e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
< $(srcdir)/getopt.in.h; \
*** modules/iconv-h.orig Mon Oct 4 23:31:20 2010
--- modules/iconv-h Mon Oct 4 23:25:28 2010
***************
*** 24,29 ****
--- 24,30 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
*** modules/inttypes.orig Mon Oct 4 23:31:20 2010
--- modules/inttypes Mon Oct 4 23:25:28 2010
***************
*** 27,32 ****
--- 27,33 ----
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_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' \
-e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
-e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
-e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
*** modules/langinfo.orig Mon Oct 4 23:31:20 2010
--- modules/langinfo Mon Oct 4 23:25:28 2010
***************
*** 25,30 ****
--- 25,31 ----
sed -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' \
-e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
-e 's|@''GNULIB_NL_LANGINFO''@|$(GNULIB_NL_LANGINFO)|g' \
-e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
*** modules/locale.orig Mon Oct 4 23:31:20 2010
--- modules/locale Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
-e 's|@''GNULIB_DUPLOCALE''@|$(GNULIB_DUPLOCALE)|g' \
-e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
*** modules/math.orig Mon Oct 4 23:31:20 2010
--- modules/math Mon Oct 4 23:17:08 2010
***************
*** 24,29 ****
--- 24,30 ----
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -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' \
-e 's|@''GNULIB_ACOSL''@|$(GNULIB_ACOSL)|g' \
-e 's|@''GNULIB_ASINL''@|$(GNULIB_ASINL)|g' \
*** modules/netdb.orig Mon Oct 4 23:31:20 2010
--- modules/netdb Mon Oct 4 23:25:28 2010
***************
*** 25,30 ****
--- 25,31 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \
-e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \
-e 's|@''GNULIB_GETADDRINFO''@|$(GNULIB_GETADDRINFO)|g' \
*** modules/netinet_in.orig Mon Oct 4 23:31:20 2010
--- modules/netinet_in Mon Oct 4 23:17:08 2010
***************
*** 24,29 ****
--- 24,30 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|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; \
*** modules/poll-h.orig Mon Oct 4 23:31:20 2010
--- modules/poll-h Mon Oct 4 23:25:28 2010
***************
*** 25,30 ****
--- 25,31 ----
sed -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' \
-e 's|@''NEXT_POLL_H''@|$(NEXT_POLL_H)|g' \
-e 's|@''GNULIB_POLL''@|$(GNULIB_POLL)|g' \
-e 's|@''HAVE_POLL''@|$(HAVE_POLL)|g' \
*** modules/pthread.orig Mon Oct 4 23:31:20 2010
--- modules/pthread Mon Oct 4 23:25:28 2010
***************
*** 23,28 ****
--- 23,29 ----
sed -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' \
-e 's|@''NEXT_PTHREAD_H''@|$(NEXT_PTHREAD_H)|g' \
-e 's|@''HAVE_PTHREAD_T''@|$(HAVE_PTHREAD_T)|g' \
-e 's|@''HAVE_PTHREAD_SPINLOCK_T''@|$(HAVE_PTHREAD_SPINLOCK_T)|g'
\
*** modules/pty.orig Mon Oct 4 23:31:20 2010
--- modules/pty Mon Oct 4 23:25:28 2010
***************
*** 24,29 ****
--- 24,30 ----
sed -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' \
-e 's|@''NEXT_PTY_H''@|$(NEXT_PTY_H)|g' \
-e 's|@''GNULIB_FORKPTY''@|$(GNULIB_FORKPTY)|g' \
-e 's|@''GNULIB_OPENPTY''@|$(GNULIB_OPENPTY)|g' \
*** modules/sched.orig Mon Oct 4 23:31:20 2010
--- modules/sched Mon Oct 4 23:17:08 2010
***************
*** 22,27 ****
--- 22,28 ----
sed -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' \
-e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \
-e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g'
\
< $(srcdir)/sched.in.h; \
*** modules/search.orig Mon Oct 4 23:31:20 2010
--- modules/search Mon Oct 4 23:25:28 2010
***************
*** 25,30 ****
--- 25,31 ----
sed -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' \
-e 's|@''NEXT_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
-e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \
-e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
*** modules/selinux-h.orig Mon Oct 4 23:31:20 2010
--- modules/selinux-h Mon Oct 4 23:25:28 2010
***************
*** 27,32 ****
--- 27,33 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SELINUX_SELINUX_H''@|$(NEXT_SELINUX_SELINUX_H)|g' \
-e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \
< $(srcdir)/se-selinux.in.h; \
*** modules/signal.orig Mon Oct 4 23:31:20 2010
--- modules/signal Mon Oct 4 23:17:08 2010
***************
*** 24,29 ****
--- 24,30 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g'
\
-e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
*** modules/spawn.orig Mon Oct 4 23:31:20 2010
--- modules/spawn Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
sed -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' \
-e 's|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \
-e 's|@''GNULIB_POSIX_SPAWN''@|$(GNULIB_POSIX_SPAWN)|g' \
-e 's|@''GNULIB_POSIX_SPAWNP''@|$(GNULIB_POSIX_SPAWNP)|g' \
*** modules/stdarg.orig Mon Oct 4 23:31:20 2010
--- modules/stdarg Mon Oct 4 23:17:08 2010
***************
*** 28,33 ****
--- 28,34 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
< $(srcdir)/stdarg.in.h; \
} > $...@-t && \
*** modules/stddef.orig Mon Oct 4 23:31:20 2010
--- modules/stddef Mon Oct 4 23:17:08 2010
***************
*** 22,27 ****
--- 22,28 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
-e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
*** modules/stdint.orig Mon Oct 4 23:31:20 2010
--- modules/stdint Mon Oct 4 23:25:28 2010
***************
*** 30,35 ****
--- 30,36 ----
sed -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' \
-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' \
*** modules/stdio.orig Mon Oct 4 23:31:20 2010
--- modules/stdio Mon Oct 4 23:17:08 2010
***************
*** 28,33 ****
--- 28,34 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
-e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
*** modules/stdlib.orig Mon Oct 4 23:31:20 2010
--- modules/stdlib Mon Oct 4 23:17:08 2010
***************
*** 27,32 ****
--- 27,33 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-e 's|@''GNULIB__EXIT''@|$(GNULIB__EXIT)|g' \
-e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
*** modules/string.orig Mon Oct 4 23:31:20 2010
--- modules/string Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
-e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
*** modules/strings.orig Mon Oct 4 23:31:20 2010
--- modules/strings Mon Oct 4 23:25:28 2010
***************
*** 23,28 ****
--- 23,29 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|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' \
*** modules/sys_file.orig Mon Oct 4 23:31:20 2010
--- modules/sys_file Mon Oct 4 23:25:29 2010
***************
*** 25,30 ****
--- 25,31 ----
sed -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' \
-e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \
-e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \
-e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \
*** modules/sys_ioctl.orig Mon Oct 4 23:31:20 2010
--- modules/sys_ioctl Mon Oct 4 23:25:29 2010
***************
*** 27,32 ****
--- 27,33 ----
sed -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' \
-e 's|@''NEXT_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \
-e 's|@''GNULIB_IOCTL''@|$(GNULIB_IOCTL)|g' \
-e
's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \
*** modules/sys_select.orig Mon Oct 4 23:31:20 2010
--- modules/sys_select Mon Oct 4 23:25:29 2010
***************
*** 27,32 ****
--- 27,33 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
-e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \
-e 's|@''GNULIB_SELECT''@|$(GNULIB_SELECT)|g' \
*** modules/sys_socket.orig Mon Oct 4 23:31:20 2010
--- modules/sys_socket Mon Oct 4 23:17:08 2010
***************
*** 30,35 ****
--- 30,36 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|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|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
*** modules/sys_stat.orig Mon Oct 4 23:31:20 2010
--- modules/sys_stat Mon Oct 4 23:17:08 2010
***************
*** 28,33 ****
--- 28,34 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
-e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
*** modules/sys_time.orig Mon Oct 4 23:31:20 2010
--- modules/sys_time Mon Oct 4 23:17:08 2010
***************
*** 27,32 ****
--- 27,33 ----
sed -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' \
-e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
-e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
-e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
*** modules/sys_times.orig Mon Oct 4 23:31:20 2010
--- modules/sys_times Mon Oct 4 23:25:29 2010
***************
*** 26,31 ****
--- 26,32 ----
sed -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' \
-e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \
-e 's|@''GNULIB_TIMES''@|$(GNULIB_TIMES)|g' \
-e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \
*** modules/sys_utsname.orig Mon Oct 4 23:31:20 2010
--- modules/sys_utsname Mon Oct 4 23:25:29 2010
***************
*** 26,31 ****
--- 26,32 ----
sed -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' \
-e 's|@''NEXT_SYS_UTSNAME_H''@|$(NEXT_SYS_UTSNAME_H)|g' \
-e 's|@''GNULIB_UNAME''@|$(GNULIB_UNAME)|g' \
-e 's|@''HAVE_STRUCT_UTSNAME''@|$(HAVE_STRUCT_UTSNAME)|g' \
*** modules/sys_wait.orig Mon Oct 4 23:31:20 2010
--- modules/sys_wait Mon Oct 4 23:17:08 2010
***************
*** 25,30 ****
--- 25,31 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-e 's|@''GNULIB_WAITPID''@|$(GNULIB_WAITPID)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
*** modules/sysexits.orig Mon Oct 4 23:31:20 2010
--- modules/sysexits Mon Oct 4 23:25:28 2010
***************
*** 22,27 ****
--- 22,28 ----
sed -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' \
-e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \
< $(srcdir)/sysexits.in.h; \
} > $...@-t && \
*** modules/termios.orig Mon Oct 4 23:31:20 2010
--- modules/termios Mon Oct 4 23:25:29 2010
***************
*** 23,28 ****
--- 23,29 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \
-e 's|@''GNULIB_TCGETSID''@|$(GNULIB_TCGETSID)|g' \
-e 's|@''HAVE_TCGETSID''@|$(HAVE_TCGETSID)|g' \
*** modules/time.orig Mon Oct 4 23:31:20 2010
--- modules/time Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
-e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
*** modules/unistd.orig Mon Oct 4 23:31:20 2010
--- modules/unistd Mon Oct 4 23:25:29 2010
***************
*** 26,31 ****
--- 26,32 ----
sed -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' \
-e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
-e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
*** modules/wchar.orig Mon Oct 4 23:31:20 2010
--- modules/wchar Mon Oct 4 23:17:08 2010
***************
*** 26,31 ****
--- 26,32 ----
{ 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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
*** modules/wctype.orig Mon Oct 4 23:31:20 2010
--- modules/wctype Mon Oct 4 23:25:29 2010
***************
*** 25,30 ****
--- 25,31 ----
sed -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' \
-e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
-e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
