Avoid line length limitation from HP NonStop system header files.

author Bruno Haible <bruno@clisp.org>

Mon, 4 Oct 2010 21:35:51 +0000 (23:35 +0200)

committer Bruno Haible <bruno@clisp.org>

Mon, 4 Oct 2010 21:35:51 +0000 (23:35 +0200)
author Bruno Haible <bruno@clisp.org>
Mon, 4 Oct 2010 21:35:51 +0000 (23:35 +0200)
committer Bruno Haible <bruno@clisp.org>
Mon, 4 Oct 2010 21:35:51 +0000 (23:35 +0200)
diff --git a/ChangeLog b/ChangeLog

index 4a556ce56718cfe481890df9826948ce47d0ee31..b466ae874b3fd064e8e7112a508f7d5a6c44ed83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,96 @@
+2010-10-04  Bruno Haible  <bruno@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.
+
  2010-10-04  Bruno Haible  <bruno@clisp.org>
  
         read-file tests: Avoid a test failure on NonStop Kernel.
diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h

index da4740b22786c2c95fe4ce5f3def80c349aed651..2932f8ef503647ce2b63dc962e79a8dc42378456 100644 (file)
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -21,6 +21,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc
     under MinGW.
diff --git a/lib/ctype.in.h b/lib/ctype.in.h

index ccf222d76af363774d15897a3dcc72d008167659..55b0b30eae5c92a01afa72aff3d3caad64090b31 100644 (file)
--- a/lib/ctype.in.h
+++ b/lib/ctype.in.h
@@ -28,6 +28,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* Include the original <ctype.h>.  */
  /* The include_next requires a split double-inclusion guard.  */
diff --git a/lib/dirent.in.h b/lib/dirent.in.h

index afcad9c7a89a4b5517e16ababb7345a2114fc96a..c582d1c58590d803723dd507ad27ec417446da4f 100644 (file)
--- a/lib/dirent.in.h
+++ b/lib/dirent.in.h
@@ -19,6 +19,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_DIRENT_H@
diff --git a/lib/errno.in.h b/lib/errno.in.h

index cf8dde6ff03887924ad9f830ac73948a48e34e58..3afdd9632654b46d6bb88ea055841388f9136f64 100644 (file)
--- a/lib/errno.in.h
+++ b/lib/errno.in.h
@@ -21,6 +21,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h

index a7e4a95016223e58d5f8c18105b177c1c145df2e..663e49f32beefe0c2cef9851bd1e16419fca88c9 100644 (file)
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if defined __need_system_fcntl_h
  /* Special invocation convention.  */
diff --git a/lib/float.in.h b/lib/float.in.h

index caf822f1d0a98a043977c2e1283acb57c2aeffeb..a68ec61a9667ce95a8897add609c38fa14e7baf7 100644 (file)
--- a/lib/float.in.h
+++ b/lib/float.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_FLOAT_H@
diff --git a/lib/getopt.in.h b/lib/getopt.in.h

index 57a8e8992d98cd03cd5cbb1119b00e3dd56a7937..adc28907d3479f42e6bab22f5f13a013d42d8437 100644 (file)
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -21,6 +21,7 @@
  #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
diff --git a/lib/iconv.in.h b/lib/iconv.in.h

index c8f516b0675a1e9cbbc7a074ba411936d9c34272..6d0d9123a2bd9355b92c727ad19214b15788eeb7 100644 (file)
--- a/lib/iconv.in.h
+++ b/lib/iconv.in.h
@@ -21,6 +21,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_ICONV_H@
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h

index aef157daf6452c13399cc297008ea29f6279625a..97bedb2ee70136ef9d083aa8607d1da5447a0251 100644 (file)
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -23,6 +23,7 @@
  #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
diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h

index b79908a652ecc65d915959933c61420eef2a3c6f..de4a74153b0955fa7ba94142d7d513fe88a203cc 100644 (file)
--- a/lib/langinfo.in.h
+++ b/lib/langinfo.in.h
@@ -25,6 +25,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_LANGINFO_H@
diff --git a/lib/locale.in.h b/lib/locale.in.h

index 75b529932b2817e0042ff0f10f59619c2c420427..3c243b352d8c8e4b4e346ac91b3091aefbad7aff 100644 (file)
--- a/lib/locale.in.h
+++ b/lib/locale.in.h
@@ -19,6 +19,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_LOCALE_H@
diff --git a/lib/math.in.h b/lib/math.in.h

index 63950327de76cd2844eb84c3e759d5d0b7c545b7..4fbed08d674d247217c940e44149af0c023673ff 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -20,6 +20,7 @@
  #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@
diff --git a/lib/netdb.in.h b/lib/netdb.in.h

index 8789550b6eea391b5a639cb409e2edf7abbb70b2..efbf7b4bc9a60272488ca42e9ddffa5df5b221a0 100644 (file)
--- a/lib/netdb.in.h
+++ b/lib/netdb.in.h
@@ -25,6 +25,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if @HAVE_NETDB_H@
  
diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h

index cbb38f3ff08492cc30be26c6c9fbd5d5cb5ecea5..3e0645c69d6dbdcee74bea4e836f488eda32a90a 100644 (file)
--- a/lib/netinet_in.in.h
+++ b/lib/netinet_in.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if @HAVE_NETINET_IN_H@
  
diff --git a/lib/poll.in.h b/lib/poll.in.h

index cb8a6f8869831bb9e377cdeb01c3517073562770..ec3c24288f21427a1356407f5c46b09738d67ccb 100644 (file)
--- a/lib/poll.in.h
+++ b/lib/poll.in.h
@@ -24,6 +24,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_POLL_H@
diff --git a/lib/pthread.in.h b/lib/pthread.in.h

index f8e358b84ace21e5f3eae4a33c1543d1f52d55e1..66847f818bd8427a2aedcb380cc791ef7a928fd5 100644 (file)
--- a/lib/pthread.in.h
+++ b/lib/pthread.in.h
@@ -23,6 +23,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_PTHREAD_H@
diff --git a/lib/pty.in.h b/lib/pty.in.h

index 8d32d71421017e28b76e06022c9778fd7ce97808..48d942e36484be2afb2b426830e7d287f41a8a21 100644 (file)
--- a/lib/pty.in.h
+++ b/lib/pty.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_PTY_H@
diff --git a/lib/sched.in.h b/lib/sched.in.h

index a164133bbd8c2d5680b9cc1f909379677f7a404b..524eba5c4e0cd30ce0b2bff1615d77bddeb74937 100644 (file)
--- a/lib/sched.in.h
+++ b/lib/sched.in.h
@@ -19,6 +19,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_SCHED_H@
diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h

index d00f81bfa287b9aa4f7ce583597334516bdcabc7..03e2105a3dbdf00065fc757a12d24d9068863f29 100644 (file)
--- a/lib/se-selinux.in.h
+++ b/lib/se-selinux.in.h
@@ -20,6 +20,7 @@
  # if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  # endif
+@PRAGMA_COLUMNS@
  
  # if HAVE_SELINUX_SELINUX_H
  
diff --git a/lib/search.in.h b/lib/search.in.h

index 20551a94af3617f9422acf7b491646e1b1752cc5..638e93aaa2a16dd32e00c3aba0db8a5190784cb6 100644 (file)
--- a/lib/search.in.h
+++ b/lib/search.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_SEARCH_H@
diff --git a/lib/signal.in.h b/lib/signal.in.h

index 620148d3a7632c0715b3ae8b51471da847f06e88..7ab1737492253eb92bb4101415cfa7c8dc0c066e 100644 (file)
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -18,6 +18,7 @@
  #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.  */
diff --git a/lib/spawn.in.h b/lib/spawn.in.h

index 73b34399d6a0c5bbb10f574ed27e59c48f7bc1ee..fa416192866a6c9c9c72952e209be011167b9135 100644 (file)
--- a/lib/spawn.in.h
+++ b/lib/spawn.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_SPAWN_H@
diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h

index 9a8d02930c5ba1e777ed42c8f2fe6586fd005eec..9bb5a202fe62cb86444d48fbccf0cecf3a9af8e4 100644 (file)
--- a/lib/stdarg.in.h
+++ b/lib/stdarg.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_STDARG_H@
diff --git a/lib/stddef.in.h b/lib/stddef.in.h

index 4bfd8668929fbb881991a0f1aac3a00393c7ea9d..d30a708ad33ea54723983621bf49ce372ea8a2f2 100644 (file)
--- a/lib/stddef.in.h
+++ b/lib/stddef.in.h
@@ -26,6 +26,7 @@
  #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 \
diff --git a/lib/stdint.in.h b/lib/stdint.in.h

index 26f9e6b7ae824719f0adc44b7bd31a02ec020635..5ff935e3f541447f1300d83afd57d91f46c6c106 100644 (file)
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -26,6 +26,7 @@
  #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
diff --git a/lib/stdio.in.h b/lib/stdio.in.h

index 442183c3296f8be331922fd43d87b4aa1260bb71..efd2609d3efbd25bdd8b75673d6c3a9526186c06 100644 (file)
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -19,6 +19,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if defined __need_FILE || defined __need___FILE
  /* Special invocation convention inside glibc header files.  */
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h

index 10efdcadb7fbccd62939d721eb0e4d713a7797bd..6fe75d330fae7ac7bfb64b6eee4b53174ea7cde5 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -18,6 +18,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if defined __need_malloc_and_calloc
  /* Special invocation convention inside glibc header files.  */
diff --git a/lib/string.in.h b/lib/string.in.h

index 5409f31abfd21b2d8597904891455ed318b9afd8..6b848955a8e663dce618254a6f62bdfb65f03a6c 100644 (file)
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -21,6 +21,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_STRING_H@
diff --git a/lib/strings.in.h b/lib/strings.in.h

index 093189921d13c703a3399351e6532e806c10142f..606fcc6feffbfd0d4aae42d64363e911e6a381cd 100644 (file)
--- a/lib/strings.in.h
+++ b/lib/strings.in.h
@@ -21,6 +21,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_STRINGS_H@
diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h

index 9ace671b915bef059e32b89b227f271b0a2be6d1..cfebe231f02266dc1aef6d1f5678d369256c5141 100644 (file)
--- a/lib/sys_file.in.h
+++ b/lib/sys_file.in.h
@@ -23,6 +23,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_SYS_FILE_H@
diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h

index 8b0e2361a955ee17abc83e773c04070fd9995883..949df77eb07ad825677df13311878c3487793f51 100644 (file)
--- a/lib/sys_ioctl.in.h
+++ b/lib/sys_ioctl.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_SYS_IOCTL_H@
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h

index ae2a3d23b998fd3baccd7089c3089752d6a14c7f..8f4fa0268c12b604ce25bb3f93554712d215e950 100644 (file)
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -18,6 +18,7 @@
  # 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.  */
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h

index ee8ce1180af69aa77cf8db199039ac4842848773..d7a94bf125f7309179a860a8cfa5598adc61f80a 100644 (file)
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -26,6 +26,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H
  /* Special invocation convention:
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h

index 4e2f44527e7b8efa29384e0d5525c2f79e9aacb4..f9203e5ca61b74ee99044c22d4c8234822d00c48 100644 (file)
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -24,6 +24,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if defined __need_system_sys_stat_h
  /* Special invocation convention.  */
diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h

index ba42e8da93fcec9b9a0091b2ef12297be6ec8634..94916b25a9399a846d58a5ea9ca063f4cf8ac049 100644 (file)
--- a/lib/sys_time.in.h
+++ b/lib/sys_time.in.h
@@ -21,6 +21,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if defined _GL_SYS_TIME_H
  
diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h

index 57f3a7209d5145c276234ea9a7bcf49bef7b89a8..08b0b2306bd0a4cfcc381c397e1443ae856bbaac 100644 (file)
--- a/lib/sys_times.in.h
+++ b/lib/sys_times.in.h
@@ -25,6 +25,7 @@
  # if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  # endif
+@PRAGMA_COLUMNS@
  
  # if @HAVE_SYS_TIMES_H@
  #  @INCLUDE_NEXT@ @NEXT_SYS_TIMES_H@
diff --git a/lib/sys_utsname.in.h b/lib/sys_utsname.in.h

index c0dabccb2e648bba63e84b850674ec0a7be0fd71..c1c651b812707edad6d220ca64fc5ca24bc770c9 100644 (file)
--- a/lib/sys_utsname.in.h
+++ b/lib/sys_utsname.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if @HAVE_SYS_UTSNAME_H@
  # @INCLUDE_NEXT@ @NEXT_SYS_UTSNAME_H@
diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h

index 727657cf2408fb3da6ca0940d03cde1dee497d41..d7a412640dd67552ab1eaa7a9c1543f103ae1730 100644 (file)
--- a/lib/sys_wait.in.h
+++ b/lib/sys_wait.in.h
@@ -21,6 +21,7 @@
  #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__)
diff --git a/lib/sysexits.in.h b/lib/sysexits.in.h

index 45255dfa53cfc8316bf750927e5e84f37fc62703..a8e80dcd80011dd20478e72cf2fc27945b04eb36 100644 (file)
--- a/lib/sysexits.in.h
+++ b/lib/sysexits.in.h
@@ -21,6 +21,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  #if @HAVE_SYSEXITS_H@
  
diff --git a/lib/termios.in.h b/lib/termios.in.h

index a23c5dc1fe5aa524d00f11fdcddc0c909d8ecfb3..5728ab691a5b44d1a65d907e6f252991c5c075d9 100644 (file)
--- a/lib/termios.in.h
+++ b/lib/termios.in.h
@@ -20,6 +20,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_TERMIOS_H@
diff --git a/lib/time.in.h b/lib/time.in.h

index 87608a39cb81e37294b9ec2d60f4b4a228ca17ac..28e3f5ff309d797536960db6c04c323aaf6278a5 100644 (file)
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -19,6 +19,7 @@
  #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
diff --git a/lib/unistd.in.h b/lib/unistd.in.h

index 4c9a4a8f9d2258cc41c42ded222111e5f36c0172..2221b5d8aecd82d565a59048d8ff9bdcce012335 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -18,6 +18,7 @@
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
  #endif
+@PRAGMA_COLUMNS@
  
  /* Special invocation convention:
     - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
diff --git a/lib/wchar.in.h b/lib/wchar.in.h

index 342a9d251477077b04810d6a950bd0c26c6ecec9..3b57f00347f73a4f82453708468d11ddc75d7ee7 100644 (file)
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -29,6 +29,7 @@
  #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:
diff --git a/lib/wctype.in.h b/lib/wctype.in.h

index e5d26af175991f38b85dc18ae90e00ed34d09aa7..1f209f3370b429da563fff3e79114d3839b78b2e 100644 (file)
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -31,6 +31,7 @@
  #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>.
diff --git a/m4/include_next.m4 b/m4/include_next.m4

index 51a719b0a897c3f96e8b635080ef8d9ed4b8ba2c..e37eb0567dbedcbb821ce33e164b2f24c26019a8 100644 (file)
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -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 does not warn about some things, and on some systems (Solaris and Interix)
  dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
  dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
  dnl of plain '__STDC__'.
+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 @@ dnl We intentionally avoid using AC_LANG_SOURCE here.
    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 ...)
diff --git a/modules/arpa_inet b/modules/arpa_inet

index 09eaee532f8a258b3966b535f74e1e0c93ecee2e..d75187380938606457570ec8a5277a625fb47386 100644 (file)
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -26,6 +26,7 @@ arpa/inet.h: arpa_inet.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
         { 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' \
diff --git a/modules/ctype b/modules/ctype

index be01f0c7fc0c19d5d2542da1eb65523db17925ca..f0ec9111b95b1f938f68e523074f9484852c7171 100644 (file)
--- a/modules/ctype
+++ b/modules/ctype
@@ -23,6 +23,7 @@ ctype.h: ctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/dirent b/modules/dirent

index 42a70f469c915ab4d0084b7a8337bc9f66181cf1..3029d73afcf8bf91648813e0b14f2f5aff9d8c58 100644 (file)
--- a/modules/dirent
+++ b/modules/dirent
@@ -25,6 +25,7 @@ dirent.h: dirent.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/errno b/modules/errno

index 70fbd8f378fd0ff83ee935591504e06dd7bcc812..b730071ea74b0f346d22c77819a208e41ffcac4a 100644 (file)
--- a/modules/errno
+++ b/modules/errno
@@ -21,6 +21,7 @@ errno.h: errno.in.h
         { 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' \
diff --git a/modules/fcntl-h b/modules/fcntl-h

index c6c18ff09272f999ba3f1edad4778ec36558bac1..c275a4e041c52f9d19897fef9716be130c17d556 100644 (file)
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -27,6 +27,7 @@ fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/float b/modules/float

index b7f068e978bb049628cb7e16cd56a501f655e7e0..c98853b7043731f319edc697707cddc1a4b8b630 100644 (file)
--- a/modules/float
+++ b/modules/float
@@ -21,6 +21,7 @@ float.h: float.in.h
         { 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 && \
diff --git a/modules/getopt-posix b/modules/getopt-posix

index cbcf4a00279fc78cb4d2d85cab7acf067c812136..39b10a40ad2a62b0b5aba59d1fd728bf488e301f 100644 (file)
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -29,6 +29,7 @@ getopt.h: getopt.in.h $(ARG_NONNULL_H)
           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; \
diff --git a/modules/iconv-h b/modules/iconv-h

index b0fd1371af0194cb726124c97215190f24a3de26..46399cd2a0de9b9620cc3bea58b48dbaac32621e 100644 (file)
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -24,6 +24,7 @@ iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/inttypes b/modules/inttypes

index 575cb25a62311f994e197428262f4d3814dd1721..674d83ebcb4ee884c55d3735d81c0ab4c7444776 100644 (file)
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -27,6 +27,7 @@ inttypes.h: inttypes.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
           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' \
diff --git a/modules/langinfo b/modules/langinfo

index b6f5373d7c6d33e2b4bdac6e6a11b19a0b7b0cfa..fd23db9f2aec73920f7ab847d9b5732c347d5458 100644 (file)
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -25,6 +25,7 @@ langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/locale b/modules/locale

index 62ae978a4a0ba35de63a3b3a9c24782b94d0ddcb..b80b5133290addce9dd9e5b1895f97b42ab8ba8e 100644 (file)
--- a/modules/locale
+++ b/modules/locale
@@ -26,6 +26,7 @@ locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/math b/modules/math

index 6c23164f6137bd84a6bcc1c05b1375798215aace..ca9aa1ab3b6907af2bde3b40fef35a4a37b35e0e 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -24,6 +24,7 @@ math.h: math.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/netdb b/modules/netdb

index b35fda174ea3d6cd473c0ec2eb27cf22a1af5982..ea7dc63c1113f72371eb24694761863d1248fe7f 100644 (file)
--- a/modules/netdb
+++ b/modules/netdb
@@ -25,6 +25,7 @@ netdb.h: netdb.in.h $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/netinet_in b/modules/netinet_in

index 683e0db8b56f0f8cc107b9eb66193497b8d1d044..06df756a81123e9a5419aef4b0422627657640ca 100644 (file)
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -24,6 +24,7 @@ netinet/in.h: netinet_in.in.h
         { 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; \
diff --git a/modules/poll-h b/modules/poll-h

index c456ae53009981db846f7cf2dcdaa645554621c1..347fc607f06806b4abeb296e6bc2b05bba41e8dc 100644 (file)
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -25,6 +25,7 @@ poll.h: poll.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/pthread b/modules/pthread

index 6d064649f045dce0a2f05fd0216c3aa47ae47dee..e29016a447c13d92ab41f70adc7aab4d585b08bd 100644 (file)
--- a/modules/pthread
+++ b/modules/pthread
@@ -23,6 +23,7 @@ pthread.h: pthread.in.h
           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' \
diff --git a/modules/pty b/modules/pty

index a740cac1ae9bc5038e35d17c188a9957c4f2bc69..93f280ca9f117c5120409f99561c247f89f3ea1e 100644 (file)
--- a/modules/pty
+++ b/modules/pty
@@ -24,6 +24,7 @@ pty.h: pty.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/sched b/modules/sched

index bdcb15d81b5e59102611480f94fe91665deb1b20..d126fc761644ffb174b8487152ff31a3163a15de 100644 (file)
--- a/modules/sched
+++ b/modules/sched
@@ -22,6 +22,7 @@ sched.h: sched.in.h
           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; \
diff --git a/modules/search b/modules/search

index 1188890a0587f0b3d5475a16f8f66cb3a41b8b4d..ceed3ffedb25088a872946a6364d841f03fadde2 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -25,6 +25,7 @@ search.h: search.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/selinux-h b/modules/selinux-h

index 12dd20d889c7f45fbd257a3b970683a482542305..745ea4950d7394024beebe758b89126a4d40b08c 100644 (file)
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -27,6 +27,7 @@ selinux/selinux.h: se-selinux.in.h $(UNUSED_PARAMETER_H)
         { 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; \
diff --git a/modules/signal b/modules/signal

index 1e65cb169ff10264f49d43acd792a91d76b97352..c9ff197bbe6c380ca5b5aa157dba023267110a3d 100644 (file)
--- a/modules/signal
+++ b/modules/signal
@@ -24,6 +24,7 @@ signal.h: signal.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/spawn b/modules/spawn

index 02adbcf64dc9ba489ba7a1810fdc6d6d5ef548d9..61e5e073eda32d253bea6d5db0da554798902823 100644 (file)
--- a/modules/spawn
+++ b/modules/spawn
@@ -26,6 +26,7 @@ spawn.h: spawn.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/stdarg b/modules/stdarg

index f9dd9aa381b1c54f3af75145c8e0527daeb3a9ff..05a01db69b6102a9851defd67b2aecebe3b08133 100644 (file)
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -28,6 +28,7 @@ stdarg.h: stdarg.in.h
         { 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 && \
diff --git a/modules/stddef b/modules/stddef

index a6175c27eb4e7340bc0d56341aa581e6623ac24f..4836bc7a8fa88641f66715dce32aa7c86694249e 100644 (file)
--- a/modules/stddef
+++ b/modules/stddef
@@ -22,6 +22,7 @@ stddef.h: stddef.in.h
         { 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' \
diff --git a/modules/stdint b/modules/stdint

index dd01df1ed2ae320bbfc57bafb45e5667675a6a76..9e5f7ad4ebc1bb97d085a8f726536166a08788d4 100644 (file)
--- a/modules/stdint
+++ b/modules/stdint
@@ -30,6 +30,7 @@ stdint.h: stdint.in.h
           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' \
diff --git a/modules/stdio b/modules/stdio

index 218d99ec5431d53baa4a02e8147ac1427f397cc5..f27322eefdc15f39910980480289d5ee6b209d1e 100644 (file)
--- a/modules/stdio
+++ b/modules/stdio
@@ -28,6 +28,7 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/stdlib b/modules/stdlib

index 3392c8df3077004673ea2320c4fbb1cd6604bbc5..4b889a1e1b1aaab9094a76062c09bc1607712548 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -27,6 +27,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/string b/modules/string

index c02cef67ed7f4c0375565ed8ed526a8135376aad..f22c389df8186215e7bdd4965697570c99fbad1c 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -26,6 +26,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/strings b/modules/strings

index 37ab99960c234db3c1b55f6f47a19faa3cc226f0..9b7a48e0f23ce0f7ea4cf9e41d2a1daf30e44712 100644 (file)
--- a/modules/strings
+++ b/modules/strings
@@ -23,6 +23,7 @@ strings.h: strings.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
         { 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' \
diff --git a/modules/sys_file b/modules/sys_file

index b08e4189814405ac742ae12728fb036ee95c896f..1da1655b4574547c620f9a1310e922eafa3338cc 100644 (file)
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -25,6 +25,7 @@ sys/file.h: sys_file.in.h $(WARN_ON_USE_H)
           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' \
diff --git a/modules/sys_ioctl b/modules/sys_ioctl

index b8b823050cf8565987b055a3ab8a9a491a115a76..669f70b08473474daac6f4150fc0e2202b5c612a 100644 (file)
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -27,6 +27,7 @@ sys/ioctl.h: sys_ioctl.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/sys_select b/modules/sys_select

index 4f4d6d9bb358882e540045280d2889a067fe9bd6..3fbbd57f4dbb568b19ffaa82fd1df983668f92fa 100644 (file)
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -27,6 +27,7 @@ sys/select.h: sys_select.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/sys_socket b/modules/sys_socket

index 08c90b2a448dcae183dc15c1d70cc49e48d21344..deef2c777dc5cc5e31967aad3724fe7389998ea5 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -30,6 +30,7 @@ sys/socket.h: sys_socket.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
         { 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' \
diff --git a/modules/sys_stat b/modules/sys_stat

index 059c2b8bf0fec92704ffb920eea3f5914f6e4626..40bcf6d6d2c9533a295320385282c6688a10fc6b 100644 (file)
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -28,6 +28,7 @@ sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/sys_time b/modules/sys_time

index 4df85d7e48d3b94a2db1878c9452d9d6ce255366..92f2ebbf354ff288f9e589957b0d89e241fb4a32 100644 (file)
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -27,6 +27,7 @@ sys/time.h: sys_time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/sys_times b/modules/sys_times

index 6ce9d7e9b326b5d16a76cd4c787f9836b0fd1b84..7a543b420d92a0b0d6d6103171686bf0231a27ee 100644 (file)
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -26,6 +26,7 @@ sys/times.h: sys_times.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
           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' \
diff --git a/modules/sys_utsname b/modules/sys_utsname

index 1a3d8ec2d574e25b1be2895481dae8a7edd187e2..4dec661ec8d25b7a51e32d861dcba727c40c0813 100644 (file)
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -26,6 +26,7 @@ sys/utsname.h: sys_utsname.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
           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' \
diff --git a/modules/sys_wait b/modules/sys_wait

index 01f995e87ce551d07e956002dfc0749bb612d22c..0299f9e2dea357fe7d3f69a645332055254c9608 100644 (file)
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -25,6 +25,7 @@ sys/wait.h: sys_wait.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
         { 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)' \
diff --git a/modules/sysexits b/modules/sysexits

index 5ab203172f876a6eacd1144e0175c617f1b69fb8..fc47260f98f73c94f464c10af52f5be63776c64f 100644 (file)
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -22,6 +22,7 @@ sysexits.h: sysexits.in.h
           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 && \
diff --git a/modules/termios b/modules/termios

index 3c7804c7aa2080cea8e328a42c30106dd1e51919..2930c1a1b73eef86d1a7f405da5e3b8e55fc7c41 100644 (file)
--- a/modules/termios
+++ b/modules/termios
@@ -23,6 +23,7 @@ termios.h: termios.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/time b/modules/time

index 22ddd0f2e0b0b9acd648ad6851e90c9b75668ff6..71da97dfc78098bea8823de0b8c9489c8a1601d9 100644 (file)
--- a/modules/time
+++ b/modules/time
@@ -26,6 +26,7 @@ time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/unistd b/modules/unistd

index b5a9d91098d7546757c00bb46ab3d7040ca1deb7..eab8ce9a5481bbf510bf3b3e8cb7d220bd89325a 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -26,6 +26,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
           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' \
diff --git a/modules/wchar b/modules/wchar

index da1c2b35eb14eb4fe2075470ae001b8b3b05a112..c9d5c46c3cd44efc5d3f995ca38de6c1af62047a 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -26,6 +26,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         { 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' \
diff --git a/modules/wctype b/modules/wctype

index b6407c4c1180d5799f25dc35bec0967b9cce2ecf..b0fc26d09f3c068db328d0f3a51b7a395fd6a5e8 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -25,6 +25,7 @@ wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
           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' \
author	Bruno Haible <bruno@clisp.org>
	Mon, 4 Oct 2010 21:35:51 +0000 (23:35 +0200)
committer	Bruno Haible <bruno@clisp.org>
	Mon, 4 Oct 2010 21:35:51 +0000 (23:35 +0200)
ChangeLog		patch \| blob \| history
lib/arpa_inet.in.h		patch \| blob \| history
lib/ctype.in.h		patch \| blob \| history
lib/dirent.in.h		patch \| blob \| history
lib/errno.in.h		patch \| blob \| history
lib/fcntl.in.h		patch \| blob \| history
lib/float.in.h		patch \| blob \| history
lib/getopt.in.h		patch \| blob \| history
lib/iconv.in.h		patch \| blob \| history
lib/inttypes.in.h		patch \| blob \| history
lib/langinfo.in.h		patch \| blob \| history
lib/locale.in.h		patch \| blob \| history
lib/math.in.h		patch \| blob \| history
lib/netdb.in.h		patch \| blob \| history
lib/netinet_in.in.h		patch \| blob \| history
lib/poll.in.h		patch \| blob \| history
lib/pthread.in.h		patch \| blob \| history
lib/pty.in.h		patch \| blob \| history
lib/sched.in.h		patch \| blob \| history
lib/se-selinux.in.h		patch \| blob \| history
lib/search.in.h		patch \| blob \| history
lib/signal.in.h		patch \| blob \| history
lib/spawn.in.h		patch \| blob \| history
lib/stdarg.in.h		patch \| blob \| history
lib/stddef.in.h		patch \| blob \| history
lib/stdint.in.h		patch \| blob \| history
lib/stdio.in.h		patch \| blob \| history
lib/stdlib.in.h		patch \| blob \| history
lib/string.in.h		patch \| blob \| history
lib/strings.in.h		patch \| blob \| history
lib/sys_file.in.h		patch \| blob \| history
lib/sys_ioctl.in.h		patch \| blob \| history
lib/sys_select.in.h		patch \| blob \| history
lib/sys_socket.in.h		patch \| blob \| history
lib/sys_stat.in.h		patch \| blob \| history
lib/sys_time.in.h		patch \| blob \| history
lib/sys_times.in.h		patch \| blob \| history
lib/sys_utsname.in.h		patch \| blob \| history
lib/sys_wait.in.h		patch \| blob \| history
lib/sysexits.in.h		patch \| blob \| history
lib/termios.in.h		patch \| blob \| history
lib/time.in.h		patch \| blob \| history
lib/unistd.in.h		patch \| blob \| history
lib/wchar.in.h		patch \| blob \| history
lib/wctype.in.h		patch \| blob \| history
m4/include_next.m4		patch \| blob \| history
modules/arpa_inet		patch \| blob \| history
modules/ctype		patch \| blob \| history
modules/dirent		patch \| blob \| history
modules/errno		patch \| blob \| history
modules/fcntl-h		patch \| blob \| history
modules/float		patch \| blob \| history
modules/getopt-posix		patch \| blob \| history
modules/iconv-h		patch \| blob \| history
modules/inttypes		patch \| blob \| history
modules/langinfo		patch \| blob \| history
modules/locale		patch \| blob \| history
modules/math		patch \| blob \| history
modules/netdb		patch \| blob \| history
modules/netinet_in		patch \| blob \| history
modules/poll-h		patch \| blob \| history
modules/pthread		patch \| blob \| history
modules/pty		patch \| blob \| history
modules/sched		patch \| blob \| history
modules/search		patch \| blob \| history
modules/selinux-h		patch \| blob \| history
modules/signal		patch \| blob \| history
modules/spawn		patch \| blob \| history
modules/stdarg		patch \| blob \| history
modules/stddef		patch \| blob \| history
modules/stdint		patch \| blob \| history
modules/stdio		patch \| blob \| history
modules/stdlib		patch \| blob \| history
modules/string		patch \| blob \| history
modules/strings		patch \| blob \| history
modules/sys_file		patch \| blob \| history
modules/sys_ioctl		patch \| blob \| history
modules/sys_select		patch \| blob \| history
modules/sys_socket		patch \| blob \| history
modules/sys_stat		patch \| blob \| history
modules/sys_time		patch \| blob \| history
modules/sys_times		patch \| blob \| history
modules/sys_utsname		patch \| blob \| history
modules/sys_wait		patch \| blob \| history
modules/sysexits		patch \| blob \| history
modules/termios		patch \| blob \| history
modules/time		patch \| blob \| history
modules/unistd		patch \| blob \| history
modules/wchar		patch \| blob \| history
modules/wctype		patch \| blob \| history