Hmm, if you'd remove the remark about misfeature, esp. in connection with the 'reported by' and my name attached to it, I think I could live with this.
And to be really on the safe side, use 32767, the maximum value. At least 2 of our headers do already, and setting it to 10000 may affect them. But I'm not sure why testing it and only put in the pragma when __TANDEM is defined, but almost always (on every other platform) having an empty #ifdef __TANDEM #endif Simpler would be to have nn all ...in.h files: #ifdef __TANDEM #pragma columns 32767 #endif No need to change any of the .m4 or .am files. No need for an extra check during configure And while at it, it'd help my porting effort it it'd be #ifdef __TANDEM #pragma columns 32767 #include <floss.h> /* Freeware Look for OSS */ #endif floss.h (and libfloss.a) contains a lot of the portability stuff we need.system Bye, Jojo -----Original Message----- From: Bruno Haible [mailto:[email protected]] Sent: Saturday, October 02, 2010 1:11 PM To: Paul Eggert Cc: Paolo Bonzini; Schmitz, Joachim; 'bug-gnulib' Subject: Re: Fwd: sed porting trouble Paul Eggert wrote: > it's better to do that than to play with unportable #pragmas. There is nothing unportable if we do it like this. Here's a proposed patch. It is - simple (it extends an already existing idiom for GCC), - not invasive (just one idiom changes), - reliable (no need to question or check future commits to these files). It would be a little more reliable if I extend this patch to cover all *.in.h files, not just those that are included by the current version of NonStop. Should I do this? 2010-10-02 Bruno Haible <[email protected]> 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/locale.in.h: Likewise. * lib/math.in.h: Likewise. * lib/netinet_in.in.h: Likewise. * lib/sched.in.h: Likewise. * lib/signal.in.h: Likewise. * lib/spawn.in.h: Likewise. * lib/stdarg.in.h: Likewise. * lib/stddef.in.h: Likewise. * lib/stdio.in.h: Likewise. * lib/stdlib.in.h: Likewise. * lib/string.in.h: Likewise. * lib/sys_socket.in.h: Likewise. * lib/sys_stat.in.h: Likewise. * lib/sys_time.in.h: Likewise. * lib/sys_wait.in.h: Likewise. * lib/time.in.h: Likewise. * lib/wchar.in.h: Likewise. * modules/arpa_inet (Makefile.am): Substitute PRAGMA_COLUMNS. * modules/ctype (Makefile.am): Likewise. * modules/locale (Makefile.am): Likewise. * modules/math (Makefile.am): Likewise. * modules/netinet_in (Makefile.am): Likewise. * modules/sched (Makefile.am): Likewise. * modules/signal (Makefile.am): Likewise. * modules/spawn (Makefile.am): Likewise. * modules/stdarg (Makefile.am): Likewise. * modules/stddef (Makefile.am): Likewise. * modules/stdio (Makefile.am): Likewise. * modules/stdlib (Makefile.am): Likewise. * modules/string (Makefile.am): Likewise. * modules/sys_socket (Makefile.am): Likewise. * modules/sys_stat (Makefile.am): Likewise. * modules/sys_time (Makefile.am): Likewise. * modules/sys_wait (Makefile.am): Likewise. * modules/time (Makefile.am): Likewise. * modules/wchar (Makefile.am): Likewise. --- m4/include_next.m4.orig Sat Oct 2 12:59:55 2010 +++ m4/include_next.m4 Sat Oct 2 12:54:33 2010 @@ -1,4 +1,4 @@ -# include_next.m4 serial 15 +# 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,6 +24,13 @@ 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,6 +105,24 @@ 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 Sat Oct 2 12:59:54 2010 +++ lib/arpa_inet.in.h Sat Oct 2 12:48:12 2010 @@ -22,6 +22,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc under MinGW. But avoid namespace pollution on glibc systems. */ --- lib/ctype.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/ctype.in.h Sat Oct 2 12:48:12 2010 @@ -29,6 +29,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* Include the original <ctype.h>. */ /* The include_next requires a split double-inclusion guard. */ #...@include_next@ @NEXT_CTYPE_H@ --- lib/locale.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/locale.in.h Sat Oct 2 12:48:12 2010 @@ -20,6 +20,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* The include_next requires a split double-inclusion guard. */ #...@include_next@ @NEXT_LOCALE_H@ --- lib/math.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/math.in.h Sat Oct 2 12:48:12 2010 @@ -21,6 +21,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* The include_next requires a split double-inclusion guard. */ #...@include_next_as_first_directive@ @NEXT_AS_FIRST_DIRECTIVE_MATH_H@ --- lib/netinet_in.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/netinet_in.in.h Sat Oct 2 12:48:12 2010 @@ -21,6 +21,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if @HAVE_NETINET_IN_H@ /* On many platforms, <netinet/in.h> assumes prior inclusion of --- lib/sched.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/sched.in.h Sat Oct 2 12:48:12 2010 @@ -20,6 +20,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* The include_next requires a split double-inclusion guard. */ #if @HAVE_SCHED_H@ # @INCLUDE_NEXT@ @NEXT_SCHED_H@ --- lib/signal.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/signal.in.h Sat Oct 2 12:48:12 2010 @@ -19,6 +19,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if defined __need_sig_atomic_t || defined __need_sigset_t /* Special invocation convention inside glibc header files. */ --- lib/spawn.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/spawn.in.h Sat Oct 2 12:48:12 2010 @@ -21,6 +21,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* The include_next requires a split double-inclusion guard. */ #if @HAVE_SPAWN_H@ # @INCLUDE_NEXT@ @NEXT_SPAWN_H@ --- lib/stdarg.in.h.orig Sat Oct 2 12:59:54 2010 +++ lib/stdarg.in.h Sat Oct 2 12:48:12 2010 @@ -21,6 +21,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* The include_next requires a split double-inclusion guard. */ #...@include_next@ @NEXT_STDARG_H@ --- lib/stddef.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/stddef.in.h Sat Oct 2 12:48:12 2010 @@ -27,6 +27,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if defined __need_wchar_t || defined __need_size_t \ || defined __need_ptrdiff_t || defined __need_NULL \ || defined __need_wint_t --- lib/stdio.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/stdio.in.h Sat Oct 2 12:48:12 2010 @@ -20,6 +20,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if defined __need_FILE || defined __need___FILE /* Special invocation convention inside glibc header files. */ --- lib/stdlib.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/stdlib.in.h Sat Oct 2 12:48:12 2010 @@ -19,6 +19,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if defined __need_malloc_and_calloc /* Special invocation convention inside glibc header files. */ --- lib/string.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/string.in.h Sat Oct 2 12:48:12 2010 @@ -22,6 +22,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* The include_next requires a split double-inclusion guard. */ #...@include_next@ @NEXT_STRING_H@ --- lib/sys_socket.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/sys_socket.in.h Sat Oct 2 12:48:12 2010 @@ -27,6 +27,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H /* Special invocation convention: - On Cygwin 1.5.x we have a sequence of nested includes --- lib/sys_stat.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/sys_stat.in.h Sat Oct 2 12:48:13 2010 @@ -25,6 +25,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if defined __need_system_sys_stat_h /* Special invocation convention. */ --- lib/sys_time.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/sys_time.in.h Sat Oct 2 12:48:13 2010 @@ -22,6 +22,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #if defined _GL_SYS_TIME_H /* Simply delegate to the system's header, without adding anything. */ --- lib/sys_wait.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/sys_wait.in.h Sat Oct 2 12:48:13 2010 @@ -22,6 +22,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* The include_next requires a split double-inclusion guard. */ #if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) # @INCLUDE_NEXT@ @NEXT_SYS_WAIT_H@ --- lib/time.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/time.in.h Sat Oct 2 12:48:13 2010 @@ -20,6 +20,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + /* Don't get in the way of glibc when it includes time.h merely to declare a few standard symbols, rather than to declare all the symbols. Also, Solaris 8 <time.h> eventually includes itself --- lib/wchar.in.h.orig Sat Oct 2 12:59:55 2010 +++ lib/wchar.in.h Sat Oct 2 12:48:13 2010 @@ -30,6 +30,10 @@ @PRAGMA_SYSTEM_HEADER@ #endif +#ifdef __TANDEM +...@pragma_columns@ +#endif + #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: - Inside glibc and uClibc header files. --- modules/arpa_inet.orig Sat Oct 2 12:59:55 2010 +++ modules/arpa_inet Sat Oct 2 12:57:48 2010 @@ -26,6 +26,7 @@ { 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 Sat Oct 2 12:59:55 2010 +++ modules/ctype Sat Oct 2 12:57:49 2010 @@ -23,6 +23,7 @@ { 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/locale.orig Sat Oct 2 12:59:55 2010 +++ modules/locale Sat Oct 2 12:57:49 2010 @@ -26,6 +26,7 @@ { 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 Sat Oct 2 12:59:55 2010 +++ modules/math Sat Oct 2 12:57:49 2010 @@ -24,6 +24,7 @@ { 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/netinet_in.orig Sat Oct 2 12:59:55 2010 +++ modules/netinet_in Sat Oct 2 12:57:49 2010 @@ -24,6 +24,7 @@ { 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/sched.orig Sat Oct 2 12:59:55 2010 +++ modules/sched Sat Oct 2 12:57:49 2010 @@ -22,6 +22,7 @@ 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/signal.orig Sat Oct 2 12:59:55 2010 +++ modules/signal Sat Oct 2 12:57:49 2010 @@ -24,6 +24,7 @@ { 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 Sat Oct 2 12:59:55 2010 +++ modules/spawn Sat Oct 2 12:57:49 2010 @@ -26,6 +26,7 @@ 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 Sat Oct 2 12:59:55 2010 +++ modules/stdarg Sat Oct 2 12:57:49 2010 @@ -28,6 +28,7 @@ { 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 Sat Oct 2 12:59:55 2010 +++ modules/stddef Sat Oct 2 12:57:49 2010 @@ -22,6 +22,7 @@ { 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/stdio.orig Sat Oct 2 12:59:55 2010 +++ modules/stdio Sat Oct 2 12:57:49 2010 @@ -28,6 +28,7 @@ { 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 Sat Oct 2 12:59:55 2010 +++ modules/stdlib Sat Oct 2 12:57:49 2010 @@ -27,6 +27,7 @@ { 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 Sat Oct 2 12:59:55 2010 +++ modules/string Sat Oct 2 12:57:49 2010 @@ -26,6 +26,7 @@ { 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/sys_socket.orig Sat Oct 2 12:59:56 2010 +++ modules/sys_socket Sat Oct 2 12:57:49 2010 @@ -30,6 +30,7 @@ { 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 Sat Oct 2 12:59:56 2010 +++ modules/sys_stat Sat Oct 2 12:57:49 2010 @@ -28,6 +28,7 @@ { 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 Sat Oct 2 12:59:56 2010 +++ modules/sys_time Sat Oct 2 12:57:49 2010 @@ -27,6 +27,7 @@ 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_wait.orig Sat Oct 2 12:59:56 2010 +++ modules/sys_wait Sat Oct 2 12:57:49 2010 @@ -25,6 +25,7 @@ { 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/time.orig Sat Oct 2 12:59:56 2010 +++ modules/time Sat Oct 2 12:57:49 2010 @@ -26,6 +26,7 @@ { 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/wchar.orig Sat Oct 2 12:59:56 2010 +++ modules/wchar Sat Oct 2 12:57:50 2010 @@ -26,6 +26,7 @@ { 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' \ Reported by Joachim Schmitz <[email protected]>.
