Allow multiple gnulib generated include files to be combined.

author Bruno Haible <bruno@clisp.org>

Sun, 29 May 2011 13:44:42 +0000 (15:44 +0200)

committer Bruno Haible <bruno@clisp.org>

Sun, 29 May 2011 13:44:42 +0000 (15:44 +0200)
author Bruno Haible <bruno@clisp.org>
Sun, 29 May 2011 13:44:42 +0000 (15:44 +0200)
committer Bruno Haible <bruno@clisp.org>
Sun, 29 May 2011 13:44:42 +0000 (15:44 +0200)
diff --git a/ChangeLog b/ChangeLog

index 1f61effe6a7adbbcb53bb87f2a28006d5d8d89e9..c6cd49f29f606099a96d3d77f6a16765ae85d5bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,101 @@
+2011-05-29  Bruno Haible  <bruno@clisp.org>
+
+       Allow multiple gnulib generated include files to be combined.
+       * gnulib-tool (func_compute_include_guard_prefix): New function.
+       (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): Resolve also
+       ${gl_include_guard_prefix} references.
+       (func_import, func_create_testdir): Invoke
+       func_compute_include_guard_prefix.
+       * lib/arpa_inet.in.h: Use the @GUARD_PREFIX@ placeholder.
+       * lib/ctype.in.h: Likewise.
+       * lib/dirent.in.h: Likewise.
+       * lib/errno.in.h: Likewise.
+       * lib/fcntl.in.h: Likewise.
+       * lib/float.in.h: Likewise.
+       * lib/getopt.in.h: Likewise.
+       * lib/iconv.in.h: Likewise.
+       * lib/langinfo.in.h: Likewise.
+       * lib/locale.in.h: Likewise.
+       * lib/math.in.h: Likewise.
+       * lib/netdb.in.h: Likewise.
+       * lib/netinet_in.in.h: Likewise.
+       * lib/poll.in.h: Likewise.
+       * lib/pthread.in.h: Likewise.
+       * lib/pty.in.h: Likewise.
+       * lib/sched.in.h: Likewise.
+       * lib/se-selinux.in.h: Likewise.
+       * lib/search.in.h: Likewise.
+       * lib/signal.in.h: Likewise.
+       * lib/spawn.in.h: Likewise.
+       * lib/stdarg.in.h: Likewise.
+       * lib/stddef.in.h: Likewise.
+       * lib/stdint.in.h: Likewise.
+       * lib/stdio.in.h: Likewise.
+       * lib/stdlib.in.h: Likewise.
+       * lib/string.in.h: Likewise.
+       * lib/strings.in.h: Likewise.
+       * lib/sys_file.in.h: Likewise.
+       * lib/sys_ioctl.in.h: Likewise.
+       * lib/sys_select.in.h: Likewise.
+       * lib/sys_socket.in.h: Likewise.
+       * lib/sys_stat.in.h: Likewise.
+       * lib/sys_time.in.h: Likewise.
+       * lib/sys_times.in.h: Likewise.
+       * lib/sys_uio.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 @GUARD_PREFIX@.
+       * modules/ctype (Makefile.am): Likewise.
+       * modules/dirent (Makefile.am): Likewise.
+       * modules/errno (Makefile.am): Likewise.
+       * modules/fcntl-h (Makefile.am): Likewise.
+       * modules/float (Makefile.am): Likewise.
+       * modules/getopt-posix (Makefile.am): Likewise.
+       * modules/iconv-h (Makefile.am): Likewise.
+       * modules/langinfo (Makefile.am): Likewise.
+       * modules/locale (Makefile.am): Likewise.
+       * modules/math (Makefile.am): Likewise.
+       * modules/netdb (Makefile.am): Likewise.
+       * modules/netinet_in (Makefile.am): Likewise.
+       * modules/poll-h (Makefile.am): Likewise.
+       * modules/pthread (Makefile.am): Likewise.
+       * modules/pty (Makefile.am): Likewise.
+       * modules/sched (Makefile.am): Likewise.
+       * modules/search (Makefile.am): Likewise.
+       * modules/selinux-h (Makefile.am): Likewise.
+       * modules/signal (Makefile.am): Likewise.
+       * modules/spawn (Makefile.am): Likewise.
+       * modules/stdarg (Makefile.am): Likewise.
+       * modules/stddef (Makefile.am): Likewise.
+       * modules/stdint (Makefile.am): Likewise.
+       * modules/stdio (Makefile.am): Likewise.
+       * modules/stdlib (Makefile.am): Likewise.
+       * modules/string (Makefile.am): Likewise.
+       * modules/strings (Makefile.am): Likewise.
+       * modules/sys_file (Makefile.am): Likewise.
+       * modules/sys_ioctl (Makefile.am): Likewise.
+       * modules/sys_select (Makefile.am): Likewise.
+       * modules/sys_socket (Makefile.am): Likewise.
+       * modules/sys_stat (Makefile.am): Likewise.
+       * modules/sys_time (Makefile.am): Likewise.
+       * modules/sys_times (Makefile.am): Likewise.
+       * modules/sys_uio (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-h (Makefile.am): Likewise.
+       * modules/assert-h (Makefile.am): Replace _GL_VERIFY_H specially.
+
  2011-05-29  Bruno Haible  <bruno@clisp.org>
  
         assert-h: Allow multiple gnulib generated replacements to coexist.
diff --git a/STATUS-libposix b/STATUS-libposix

index 58b7506d87d15f15f08aa2cf2ebaecf2f9503371..63483aa2b21b12486782531eda7c57dcf1835961 100644 (file)
--- a/STATUS-libposix
+++ b/STATUS-libposix
@@ -52,9 +52,9 @@ Bruno Haible says:
    Discussion:
    <http://lists.gnu.org/archive/html/bug-gnulib/2010-10/msg00289.html>
  
-  Half of the work has been done, but not yet pushed.
-  <http://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00199.html>
-  <http://lists.gnu.org/archive/html/bug-gnulib/2011-02/msg00078.html>
+  Still missing: dealing with include_next and old compilers, cf.
+  <http://lists.gnu.org/archive/html/bug-gnulib/2010-10/msg00269.html>
+  <http://lists.gnu.org/archive/html/bug-gnulib/2010-10/msg00285.html>
  
  2) Allow using libgnu's file name in module descriptions.
    <http://lists.gnu.org/archive/html/bug-gnulib/2010-10/msg00284.html>
diff --git a/gnulib-tool b/gnulib-tool

index 4a2ec0e80dcc38a85a0ec449b19ed4cb8808798a..81ed14e84463bef394abd65ac7fb41e43ff41b31 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3010,6 +3010,24 @@ func_modules_to_filelist_separately ()
    fi
  }
  
+# func_compute_include_guard_prefix
+# Determine include_guard_prefix.
+# Input:
+# - macro_prefix    prefix of gl_LIBOBJS macros to use
+# Output:
+# - include_guard_prefix  replacement for ${gl_include_guard_prefix}
+# - sed_replace_include_guard_prefix
+#                   sed expression for resolving ${gl_include_guard_prefix}
+func_compute_include_guard_prefix ()
+{
+  if test "$macro_prefix" = gl; then
+    include_guard_prefix='GL'
+  else
+    include_guard_prefix='GL_'`echo "$macro_prefix" | LC_ALL=C tr '[a-z]' '[A-Z]'`
+  fi
+  sed_replace_include_guard_prefix='s/\${gl_include_guard_prefix}/'"${include_guard_prefix}"'/g'
+}
+
  # func_execute_command command [args...]
  # Executes a command.
  # Uses also the variables
@@ -3154,6 +3172,8 @@ func_update_file ()
  # - po_domain       prefix of i18n domain to use (without -gnulib suffix)
  # - actioncmd       (optional) command that will reproduce this invocation
  # - for_test        true if creating a package for testing, false otherwise
+# - sed_replace_include_guard_prefix
+#                   sed expression for resolving ${gl_include_guard_prefix}
  # - destfile        filename relative to destdir of makefile being generated
  # Input/Output:
  # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val}
@@ -3215,7 +3235,8 @@ func_emit_lib_Makefile_am ()
                  -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
                  -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
                  -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
-                -e "$sed_transform_check_PROGRAMS"
+                -e "$sed_transform_check_PROGRAMS" \
+                -e "$sed_replace_include_guard_prefix"
            if test "$module" = 'alloca'; then
              echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
              echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@"
@@ -3462,6 +3483,8 @@ func_emit_po_POTFILES_in ()
  # - single_configure  true if a single configure file should be generated,
  #                     false for a separate configure file for the tests
  # - use_libtests    true if a libtests.a should be built, false otherwise
+# - sed_replace_include_guard_prefix
+#                   sed expression for resolving ${gl_include_guard_prefix}
  # - destfile        filename relative to destdir of makefile being generated
  # Input/Output:
  # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val}
@@ -3510,7 +3533,8 @@ func_emit_tests_Makefile_am ()
                  -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \
                  -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
                  -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
-                -e "$sed_transform_check_PROGRAMS"
+                -e "$sed_transform_check_PROGRAMS" \
+                -e "$sed_replace_include_guard_prefix"
            if $use_libtests && test "$module" = 'alloca'; then
              echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@"
              echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@"
@@ -4715,6 +4739,9 @@ s,^\(.................................................[^ ]*\) *,
    fi
    func_append actioncmd " `echo $specified_modules`"
  
+  # Determine include_guard_prefix.
+  func_compute_include_guard_prefix
+
    # Default the makefile name to Makefile.am.
    if test -n "$makefile_name"; then
      makefile_am=$makefile_name
@@ -5586,6 +5613,9 @@ func_create_testdir ()
      exec 0<&5 5<&-
    }
  
+  # Determine include_guard_prefix.
+  func_compute_include_guard_prefix
+
    # Create Makefile.ams that are for testing.
    for_test=true
  
diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h

index 80dcb843e0735bf23dd0e02b02afecc9fcbcb3e4..b042d6de8ddef8775eb102db796488048958adb8 100644 (file)
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_ARPA_INET_H
+#ifndef _@GUARD_PREFIX@_ARPA_INET_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -47,8 +47,8 @@
  
  #endif
  
-#ifndef _GL_ARPA_INET_H
-#define _GL_ARPA_INET_H
+#ifndef _@GUARD_PREFIX@_ARPA_INET_H
+#define _@GUARD_PREFIX@_ARPA_INET_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -111,5 +111,5 @@ _GL_WARN_ON_USE (inet_pton, "inet_pton is unportable - "
  #endif
  
  
-#endif /* _GL_ARPA_INET_H */
-#endif /* _GL_ARPA_INET_H */
+#endif /* _@GUARD_PREFIX@_ARPA_INET_H */
+#endif /* _@GUARD_PREFIX@_ARPA_INET_H */
diff --git a/lib/ctype.in.h b/lib/ctype.in.h

index 22936d9d63672d36a01504e75332edf52b653ff5..8d414f48390d2412486355e0eee1f02d6b1efac6 100644 (file)
--- a/lib/ctype.in.h
+++ b/lib/ctype.in.h
@@ -23,7 +23,7 @@
   * <http://www.opengroup.org/onlinepubs/9699919799/basedefs/ctype.h.html>
   */
  
-#ifndef _GL_CTYPE_H
+#ifndef _@GUARD_PREFIX@_CTYPE_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -34,8 +34,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_CTYPE_H@
  
-#ifndef _GL_CTYPE_H
-#define _GL_CTYPE_H
+#ifndef _@GUARD_PREFIX@_CTYPE_H
+#define _@GUARD_PREFIX@_CTYPE_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -54,5 +54,5 @@ _GL_WARN_ON_USE (isblank, "isblank is unportable - "
  # endif
  #endif
  
-#endif /* _GL_CTYPE_H */
-#endif /* _GL_CTYPE_H */
+#endif /* _@GUARD_PREFIX@_CTYPE_H */
+#endif /* _@GUARD_PREFIX@_CTYPE_H */
diff --git a/lib/dirent.in.h b/lib/dirent.in.h

index e1e734f4529f6d33762eff9d6dd33bc746a5cfa5..ebbc425511f3dd53878d37d89ca39b5cfeaee69f 100644 (file)
--- a/lib/dirent.in.h
+++ b/lib/dirent.in.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_DIRENT_H
+#ifndef _@GUARD_PREFIX@_DIRENT_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -24,8 +24,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_DIRENT_H@
  
-#ifndef _GL_DIRENT_H
-#define _GL_DIRENT_H
+#ifndef _@GUARD_PREFIX@_DIRENT_H
+#define _@GUARD_PREFIX@_DIRENT_H
  
  /* Get ino_t.  Needed on some systems, including glibc 2.8.  */
  #include <sys/types.h>
@@ -168,5 +168,5 @@ _GL_WARN_ON_USE (alphasort, "alphasort is unportable - "
  #endif
  
  
-#endif /* _GL_DIRENT_H */
-#endif /* _GL_DIRENT_H */
+#endif /* _@GUARD_PREFIX@_DIRENT_H */
+#endif /* _@GUARD_PREFIX@_DIRENT_H */
diff --git a/lib/errno.in.h b/lib/errno.in.h

index 1e41254db1b29e6fa91161694bed537ab09f3847..c413d183b4879a4561679af4ebc4548a65032bad 100644 (file)
--- a/lib/errno.in.h
+++ b/lib/errno.in.h
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_ERRNO_H
+#ifndef _@GUARD_PREFIX@_ERRNO_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
  
-#ifndef _GL_ERRNO_H
-#define _GL_ERRNO_H
+#ifndef _@GUARD_PREFIX@_ERRNO_H
+#define _@GUARD_PREFIX@_ERRNO_H
  
  
  /* On native Windows platforms, many macros are not defined.  */
@@ -163,5 +163,5 @@
  # endif
  
  
-#endif /* _GL_ERRNO_H */
-#endif /* _GL_ERRNO_H */
+#endif /* _@GUARD_PREFIX@_ERRNO_H */
+#endif /* _@GUARD_PREFIX@_ERRNO_H */
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h

index ce7c8c016cb29f26d157aaff7402d276b929efe3..0a072214a89ec47268818513490d0608d3fc293b 100644 (file)
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -40,7 +40,7 @@
  #else
  /* Normal invocation convention.  */
  
-#ifndef _GL_FCNTL_H
+#ifndef _@GUARD_PREFIX@_FCNTL_H
  
  #include <sys/types.h>
  /* On some systems other than glibc, <sys/stat.h> is a prerequisite of
@@ -55,8 +55,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
  
-#ifndef _GL_FCNTL_H
-#define _GL_FCNTL_H
+#ifndef _@GUARD_PREFIX@_FCNTL_H
+#define _@GUARD_PREFIX@_FCNTL_H
  
  #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
  # include <unistd.h>
@@ -320,6 +320,6 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
  #endif
  
  
-#endif /* _GL_FCNTL_H */
-#endif /* _GL_FCNTL_H */
+#endif /* _@GUARD_PREFIX@_FCNTL_H */
+#endif /* _@GUARD_PREFIX@_FCNTL_H */
  #endif
diff --git a/lib/float.in.h b/lib/float.in.h

index d32f20ee4d10e76f12b65bcf99bff5a1f98defd7..af6233f9f057de6c0d4e61953683dbe114494c76 100644 (file)
--- a/lib/float.in.h
+++ b/lib/float.in.h
@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_FLOAT_H
+#ifndef _@GUARD_PREFIX@_FLOAT_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -25,8 +25,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_FLOAT_H@
  
-#ifndef _GL_FLOAT_H
-#define _GL_FLOAT_H
+#ifndef _@GUARD_PREFIX@_FLOAT_H
+#define _@GUARD_PREFIX@_FLOAT_H
  
  /* 'long double' properties.  */
  #if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__)
@@ -59,5 +59,5 @@
  # define LDBL_MAX_10_EXP 4932
  #endif
  
-#endif /* _GL_FLOAT_H */
-#endif /* _GL_FLOAT_H */
+#endif /* _@GUARD_PREFIX@_FLOAT_H */
+#endif /* _@GUARD_PREFIX@_FLOAT_H */
diff --git a/lib/getopt.in.h b/lib/getopt.in.h

index 82e2937d6d282ff52af4972cd82ed94dcf2b6477..0f3918ab771095e95213552455d9608d75e3dfd6 100644 (file)
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -16,7 +16,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_GETOPT_H
+#ifndef _@GUARD_PREFIX@_GETOPT_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -32,10 +32,10 @@
  # undef _GL_SYSTEM_GETOPT
  #endif
  
-#ifndef _GL_GETOPT_H
+#ifndef _@GUARD_PREFIX@_GETOPT_H
  
  #ifndef __need_getopt
-# define _GL_GETOPT_H 1
+# define _@GUARD_PREFIX@_GETOPT_H 1
  #endif
  
  /* Standalone applications should #define __GETOPT_PREFIX to an
@@ -249,5 +249,5 @@ extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
  /* Make sure we later can get all the definitions and declarations.  */
  #undef __need_getopt
  
-#endif /* getopt.h */
-#endif /* getopt.h */
+#endif /* _@GUARD_PREFIX@_GETOPT_H */
+#endif /* _@GUARD_PREFIX@_GETOPT_H */
diff --git a/lib/iconv.in.h b/lib/iconv.in.h

index c56e483d80219b18161f81e7874c4b25cc6abcdf..6ff3493e0ee02e0f1517a82f0eb7780f5f164880 100644 (file)
--- a/lib/iconv.in.h
+++ b/lib/iconv.in.h
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_ICONV_H
+#ifndef _@GUARD_PREFIX@_ICONV_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_ICONV_H@
  
-#ifndef _GL_ICONV_H
-#define _GL_ICONV_H
+#ifndef _@GUARD_PREFIX@_ICONV_H
+#define _@GUARD_PREFIX@_ICONV_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -107,5 +107,5 @@ _GL_CXXALIASWARN (iconv_close);
  #endif
  
  
-#endif /* _GL_ICONV_H */
-#endif /* _GL_ICONV_H */
+#endif /* _@GUARD_PREFIX@_ICONV_H */
+#endif /* _@GUARD_PREFIX@_ICONV_H */
diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h

index 8a49512cf33cd790dbea4a267f146d873242ca9d..b6588a3a5ca683865ffa7552f743fa63fbc25bd3 100644 (file)
--- a/lib/langinfo.in.h
+++ b/lib/langinfo.in.h
@@ -20,7 +20,7 @@
   * <http://www.opengroup.org/onlinepubs/9699919799/basedefs/langinfo.h.html>
   */
  
-#ifndef _GL_LANGINFO_H
+#ifndef _@GUARD_PREFIX@_LANGINFO_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -32,8 +32,8 @@
  # @INCLUDE_NEXT@ @NEXT_LANGINFO_H@
  #endif
  
-#ifndef _GL_LANGINFO_H
-#define _GL_LANGINFO_H
+#ifndef _@GUARD_PREFIX@_LANGINFO_H
+#define _@GUARD_PREFIX@_LANGINFO_H
  
  
  #if !@HAVE_LANGINFO_H@
@@ -173,5 +173,5 @@ _GL_WARN_ON_USE (nl_langinfo, "nl_langinfo is not portable - "
  #endif
  
  
-#endif /* _GL_LANGINFO_H */
-#endif /* _GL_LANGINFO_H */
+#endif /* _@GUARD_PREFIX@_LANGINFO_H */
+#endif /* _@GUARD_PREFIX@_LANGINFO_H */
diff --git a/lib/locale.in.h b/lib/locale.in.h

index 1f9bafd7a3156dd3c6dce69657bf4b280b30da8b..79c1490f720080335bb09013d4a461ba9e38b5e9 100644 (file)
--- a/lib/locale.in.h
+++ b/lib/locale.in.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_LOCALE_H
+#ifndef _@GUARD_PREFIX@_LOCALE_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -24,8 +24,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_LOCALE_H@
  
-#ifndef _GL_LOCALE_H
-#define _GL_LOCALE_H
+#ifndef _@GUARD_PREFIX@_LOCALE_H
+#define _@GUARD_PREFIX@_LOCALE_H
  
  /* NetBSD 5.0 mis-defines NULL.  */
  #include <stddef.h>
@@ -92,5 +92,5 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - "
  # endif
  #endif
  
-#endif /* _GL_LOCALE_H */
-#endif /* _GL_LOCALE_H */
+#endif /* _@GUARD_PREFIX@_LOCALE_H */
+#endif /* _@GUARD_PREFIX@_LOCALE_H */
diff --git a/lib/math.in.h b/lib/math.in.h

index 9ac38ba770f5e6850ed2e0dc85e2dd251b4f9203..d6308cbb9dc1df25022a2203a21c32d3954529f5 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_MATH_H
+#ifndef _@GUARD_PREFIX@_MATH_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -25,8 +25,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_MATH_H@
  
-#ifndef _GL_MATH_H
-#define _GL_MATH_H
+#ifndef _@GUARD_PREFIX@_MATH_H
+#define _@GUARD_PREFIX@_MATH_H
  
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
@@ -806,5 +806,5 @@ _GL_WARN_REAL_FLOATING_DECL (signbit);
  #endif
  
  
-#endif /* _GL_MATH_H */
-#endif /* _GL_MATH_H */
+#endif /* _@GUARD_PREFIX@_MATH_H */
+#endif /* _@GUARD_PREFIX@_MATH_H */
diff --git a/lib/netdb.in.h b/lib/netdb.in.h

index 6951d3da493088544f5bf6c1850346447f1aad4a..1de15469135168ca97f3501ecdcb5e05163f2f13 100644 (file)
--- a/lib/netdb.in.h
+++ b/lib/netdb.in.h
@@ -20,7 +20,7 @@
     It is intended to provide definitions and prototypes needed by an
     application.  */
  
-#ifndef _GL_NETDB_H
+#ifndef _@GUARD_PREFIX@_NETDB_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -34,8 +34,8 @@
  
  #endif
  
-#ifndef _GL_NETDB_H
-#define _GL_NETDB_H
+#ifndef _@GUARD_PREFIX@_NETDB_H
+#define _@GUARD_PREFIX@_NETDB_H
  
  /* Get <netdb.h> definitions such as 'socklen_t' on IRIX 6.5 and OSF/1 4.0 and
     'struct hostent' on MinGW.  */
@@ -262,5 +262,5 @@ _GL_WARN_ON_USE (getnameinfo, "getnameinfo is unportable - "
  
  #endif
  
-#endif /* _GL_NETDB_H */
-#endif /* _GL_NETDB_H */
+#endif /* _@GUARD_PREFIX@_NETDB_H */
+#endif /* _@GUARD_PREFIX@_NETDB_H */
diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h

index 0a2fa6a83f74f3e2f6352aa12db65902e453978e..467967ce4a3323b6c2fbfc4ff6d76282293ed281 100644 (file)
--- a/lib/netinet_in.in.h
+++ b/lib/netinet_in.in.h
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_NETINET_IN_H
+#ifndef _@GUARD_PREFIX@_NETINET_IN_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -33,8 +33,8 @@
  
  #endif
  
-#ifndef _GL_NETINET_IN_H
-#define _GL_NETINET_IN_H
+#ifndef _@GUARD_PREFIX@_NETINET_IN_H
+#define _@GUARD_PREFIX@_NETINET_IN_H
  
  #if !@HAVE_NETINET_IN_H@
  
@@ -44,5 +44,5 @@
  
  #endif
  
-#endif /* _GL_NETINET_IN_H */
-#endif /* _GL_NETINET_IN_H */
+#endif /* _@GUARD_PREFIX@_NETINET_IN_H */
+#endif /* _@GUARD_PREFIX@_NETINET_IN_H */
diff --git a/lib/poll.in.h b/lib/poll.in.h

index 91add38ece89f52e2d76ff37db10f8c4c746df0c..722eff1a1295219a82d3affc7b8ef002ea76ab75 100644 (file)
--- a/lib/poll.in.h
+++ b/lib/poll.in.h
@@ -19,7 +19,7 @@
     with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_POLL_H
+#ifndef _@GUARD_PREFIX@_POLL_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -31,8 +31,8 @@
  # @INCLUDE_NEXT@ @NEXT_POLL_H@
  #endif
  
-#ifndef _GL_POLL_H
-#define _GL_POLL_H
+#ifndef _@GUARD_PREFIX@_POLL_H
+#define _@GUARD_PREFIX@_POLL_H
  
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
@@ -100,5 +100,5 @@ _GL_WARN_ON_USE (poll, "poll is unportable - "
  #endif
  
  
-#endif /* _GL_POLL_H */
-#endif /* _GL_POLL_H */
+#endif /* _@GUARD_PREFIX@_POLL_H */
+#endif /* _@GUARD_PREFIX@_POLL_H */
diff --git a/lib/pthread.in.h b/lib/pthread.in.h

index da7bd4eebfed4f062abe791349d6f6c7432ccc9e..c05c7c9f5969857594c962d6fc8ce65956e8c2ae 100644 (file)
--- a/lib/pthread.in.h
+++ b/lib/pthread.in.h
@@ -18,7 +18,7 @@
  
  /* Written by Paul Eggert and Glen Lenker.  */
  
-#ifndef _GL_PTHREAD_H_
+#ifndef _@GUARD_PREFIX@_PTHREAD_H_
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -30,8 +30,8 @@
  # @INCLUDE_NEXT@ @NEXT_PTHREAD_H@
  #endif
  
-#ifndef _GL_PTHREAD_H_
-#define _GL_PTHREAD_H_
+#ifndef _@GUARD_PREFIX@_PTHREAD_H_
+#define _@GUARD_PREFIX@_PTHREAD_H_
  
  #include <errno.h>
  #include <stdlib.h>
@@ -270,5 +270,5 @@ pthread_spin_unlock (pthread_spinlock_t *lock)
  
  #endif
  
-#endif /* _GL_PTHREAD_H_ */
-#endif /* _GL_PTHREAD_H_ */
+#endif /* _@GUARD_PREFIX@_PTHREAD_H_ */
+#endif /* _@GUARD_PREFIX@_PTHREAD_H_ */
diff --git a/lib/pty.in.h b/lib/pty.in.h

index 5eddfad5e556ee56245016767440849283287f63..bba4ba1a63241bec11e33f542beddc47c364fcce 100644 (file)
--- a/lib/pty.in.h
+++ b/lib/pty.in.h
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_PTY_H
+#ifndef _@GUARD_PREFIX@_PTY_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
  # @INCLUDE_NEXT@ @NEXT_PTY_H@
  #endif
  
-#ifndef _GL_PTY_H
-#define _GL_PTY_H
+#ifndef _@GUARD_PREFIX@_PTY_H
+#define _@GUARD_PREFIX@_PTY_H
  
  /* Some platforms declare this in a different header than glibc.  */
  #if @HAVE_UTIL_H@
@@ -120,5 +120,5 @@ _GL_WARN_ON_USE (openpty, "openpty is not declared consistently - "
  #endif
  
  
-#endif /* _GL_PTY_H */
-#endif /* _GL_PTY_H */
+#endif /* _@GUARD_PREFIX@_PTY_H */
+#endif /* _@GUARD_PREFIX@_PTY_H */
diff --git a/lib/sched.in.h b/lib/sched.in.h

index 8a1135f86dd0f439261687647335a71d10c6775e..10405d0d152bed863c2894db6809cb1733ae5564 100644 (file)
--- a/lib/sched.in.h
+++ b/lib/sched.in.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_SCHED_H
+#ifndef _@GUARD_PREFIX@_SCHED_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
  # @INCLUDE_NEXT@ @NEXT_SCHED_H@
  #endif
  
-#ifndef _GL_SCHED_H
-#define _GL_SCHED_H
+#ifndef _@GUARD_PREFIX@_SCHED_H
+#define _@GUARD_PREFIX@_SCHED_H
  
  #if !@HAVE_STRUCT_SCHED_PARAM@
  
@@ -47,5 +47,5 @@ struct sched_param
  # define SCHED_OTHER  0
  #endif
  
-#endif /* _GL_SCHED_H */
-#endif /* _GL_SCHED_H */
+#endif /* _@GUARD_PREFIX@_SCHED_H */
+#endif /* _@GUARD_PREFIX@_SCHED_H */
diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h

index 39f58814c61041762b818071e765ce5262ded27f..aa871f541c6f2fc97ae1a4cc07405af3f0e3f532 100644 (file)
--- a/lib/se-selinux.in.h
+++ b/lib/se-selinux.in.h
@@ -14,8 +14,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_SELINUX_SELINUX_H
-# define _GL_SELINUX_SELINUX_H
+#ifndef _@GUARD_PREFIX@_SELINUX_SELINUX_H
+# define _@GUARD_PREFIX@_SELINUX_SELINUX_H
  
  # if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -94,4 +94,4 @@ static inline int matchpathcon_init_prefix
  #  endif
  
  # endif
-#endif /* _GL_SELINUX_SELINUX_H */
+#endif /* _@GUARD_PREFIX@_SELINUX_SELINUX_H */
diff --git a/lib/search.in.h b/lib/search.in.h

index 53f3bbd496eff703a97c50b1f6e428c46cb96695..332cccca4af4ac4c607928ec102521e5b2acc0f6 100644 (file)
--- a/lib/search.in.h
+++ b/lib/search.in.h
@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_SEARCH_H
+#ifndef _@GUARD_PREFIX@_SEARCH_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
  # @INCLUDE_NEXT@ @NEXT_SEARCH_H@
  #endif
  
-#ifndef _GL_SEARCH_H
-#define _GL_SEARCH_H
+#ifndef _@GUARD_PREFIX@_SEARCH_H
+#define _@GUARD_PREFIX@_SEARCH_H
  
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
@@ -203,5 +203,5 @@ _GL_WARN_ON_USE (twalk, "twalk is unportable - "
  #endif
  
  
-#endif /* _GL_SEARCH_H */
-#endif /* _GL_SEARCH_H */
+#endif /* _@GUARD_PREFIX@_SEARCH_H */
+#endif /* _@GUARD_PREFIX@_SEARCH_H */
diff --git a/lib/signal.in.h b/lib/signal.in.h

index 036e4f2deb35368d3a2305f182446769b84dcc16..bcf793523a0a64d65e9ac96ffb0579144a449a57 100644 (file)
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -28,13 +28,13 @@
  #else
  /* Normal invocation convention.  */
  
-#ifndef _GL_SIGNAL_H
+#ifndef _@GUARD_PREFIX@_SIGNAL_H
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
  
-#ifndef _GL_SIGNAL_H
-#define _GL_SIGNAL_H
+#ifndef _@GUARD_PREFIX@_SIGNAL_H
+#define _@GUARD_PREFIX@_SIGNAL_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -371,6 +371,6 @@ _GL_WARN_ON_USE (sigaction, "sigaction is unportable - "
  #endif
  
  
-#endif /* _GL_SIGNAL_H */
-#endif /* _GL_SIGNAL_H */
+#endif /* _@GUARD_PREFIX@_SIGNAL_H */
+#endif /* _@GUARD_PREFIX@_SIGNAL_H */
  #endif
diff --git a/lib/spawn.in.h b/lib/spawn.in.h

index a145946c682fb3f7804c6f219597c98be467000b..3c31fd0a51dd04ace0cddfcf914350c8ad084c4d 100644 (file)
--- a/lib/spawn.in.h
+++ b/lib/spawn.in.h
@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
-#ifndef _GL_SPAWN_H
+#ifndef _@GUARD_PREFIX@_SPAWN_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
  # @INCLUDE_NEXT@ @NEXT_SPAWN_H@
  #endif
  
-#ifndef _GL_SPAWN_H
-#define _GL_SPAWN_H
+#ifndef _@GUARD_PREFIX@_SPAWN_H
+#define _@GUARD_PREFIX@_SPAWN_H
  
  /* Get definitions of 'struct sched_param' and 'sigset_t'.
     But avoid namespace pollution on glibc systems.  */
@@ -877,5 +877,5 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_adddup2,
  #endif
  
  
-#endif /* _GL_SPAWN_H */
-#endif /* _GL_SPAWN_H */
+#endif /* _@GUARD_PREFIX@_SPAWN_H */
+#endif /* _@GUARD_PREFIX@_SPAWN_H */
diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h

index 362d8c2f8c49d39df7b16f75b26e01eed746649c..345e5f0ca0f59cc2c5d8cf318b0cd50439774802 100644 (file)
--- a/lib/stdarg.in.h
+++ b/lib/stdarg.in.h
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_STDARG_H
+#ifndef _@GUARD_PREFIX@_STDARG_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -25,12 +25,12 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_STDARG_H@
  
-#ifndef _GL_STDARG_H
-#define _GL_STDARG_H
+#ifndef _@GUARD_PREFIX@_STDARG_H
+#define _@GUARD_PREFIX@_STDARG_H
  
  #ifndef va_copy
  # define va_copy(a,b) ((a) = (b))
  #endif
  
-#endif /* _GL_STDARG_H */
-#endif /* _GL_STDARG_H */
+#endif /* _@GUARD_PREFIX@_STDARG_H */
+#endif /* _@GUARD_PREFIX@_STDARG_H */
diff --git a/lib/stddef.in.h b/lib/stddef.in.h

index fa54a558b722ac58f0f6a2ee6547b2a7279fd7d9..6ac06da574fd6e897cbc6c604bc1f09c419387ad 100644 (file)
--- a/lib/stddef.in.h
+++ b/lib/stddef.in.h
@@ -38,9 +38,9 @@
     remember if special invocation has ever been used to obtain wint_t,
     in which case we need to clean up NULL yet again.  */
  
-# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
  #  ifdef __need_wint_t
-#   undef _GL_STDDEF_H
+#   undef _@GUARD_PREFIX@_STDDEF_H
  #   define _GL_STDDEF_WINT_T
  #  endif
  #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -49,14 +49,14 @@
  #else
  /* Normal invocation convention.  */
  
-# ifndef _GL_STDDEF_H
+# ifndef _@GUARD_PREFIX@_STDDEF_H
  
  /* The include_next requires a split double-inclusion guard.  */
  
  #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
  
-#  ifndef _GL_STDDEF_H
-#   define _GL_STDDEF_H
+#  ifndef _@GUARD_PREFIX@_STDDEF_H
+#   define _@GUARD_PREFIX@_STDDEF_H
  
  /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
  #if @REPLACE_NULL@
@@ -82,6 +82,6 @@
  # define wchar_t int
  #endif
  
-#  endif /* _GL_STDDEF_H */
-# endif /* _GL_STDDEF_H */
+#  endif /* _@GUARD_PREFIX@_STDDEF_H */
+# endif /* _@GUARD_PREFIX@_STDDEF_H */
  #endif /* __need_XXX */
diff --git a/lib/stdint.in.h b/lib/stdint.in.h

index 5aedeee6f78552358fbfefcefdf85356e76647ae..c44401f498b4de7805618e1683c34e3c84ad489e 100644 (file)
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -21,7 +21,7 @@
   * <http://www.opengroup.org/susv3xbd/stdint.h.html>
   */
  
-#ifndef _GL_STDINT_H
+#ifndef _@GUARD_PREFIX@_STDINT_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -52,13 +52,13 @@
    /* Other systems may have an incomplete or buggy <stdint.h>.
       Include it before <inttypes.h>, since any "#include <stdint.h>"
       in <inttypes.h> would reinclude us, skipping our contents because
-     _GL_STDINT_H is defined.
+     _@GUARD_PREFIX@_STDINT_H is defined.
       The include_next requires a split double-inclusion guard.  */
  # @INCLUDE_NEXT@ @NEXT_STDINT_H@
  #endif
  
-#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-#define _GL_STDINT_H
+#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _@GUARD_PREFIX@_STDINT_H
  
  /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
     IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
@@ -588,5 +588,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
  
  #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
  
-#endif /* _GL_STDINT_H */
-#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
+#endif /* _@GUARD_PREFIX@_STDINT_H */
+#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff --git a/lib/stdio.in.h b/lib/stdio.in.h

index 79e7f7d8aa5a02330fb07f6c88952203dc79d8d1..1ad8943fed9b1c3889d888914b782d8ea56a1771 100644 (file)
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -35,7 +35,7 @@
  #else
  /* Normal invocation convention.  */
  
-#ifndef _GL_STDIO_H
+#ifndef _@GUARD_PREFIX@_STDIO_H
  
  #define _GL_ALREADY_INCLUDING_STDIO_H
  
@@ -44,8 +44,8 @@
  
  #undef _GL_ALREADY_INCLUDING_STDIO_H
  
-#ifndef _GL_STDIO_H
-#define _GL_STDIO_H
+#ifndef _@GUARD_PREFIX@_STDIO_H
+#define _@GUARD_PREFIX@_STDIO_H
  
  /* Get va_list.  Needed on many systems, including glibc 2.8.  */
  #include <stdarg.h>
@@ -1345,6 +1345,6 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - "
  #endif
  
  
-#endif /* _GL_STDIO_H */
-#endif /* _GL_STDIO_H */
+#endif /* _@GUARD_PREFIX@_STDIO_H */
+#endif /* _@GUARD_PREFIX@_STDIO_H */
  #endif
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h

index 7513553b67273ccdc2af1272a2f0f9ee12b00f9f..62a2ce920e6955e389513b1a4b23c2df8f20210e 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -28,13 +28,13 @@
  #else
  /* Normal invocation convention.  */
  
-#ifndef _GL_STDLIB_H
+#ifndef _@GUARD_PREFIX@_STDLIB_H
  
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
  
-#ifndef _GL_STDLIB_H
-#define _GL_STDLIB_H
+#ifndef _@GUARD_PREFIX@_STDLIB_H
+#define _@GUARD_PREFIX@_STDLIB_H
  
  /* NetBSD 5.0 mis-defines NULL.  */
  #include <stddef.h>
@@ -761,6 +761,6 @@ _GL_CXXALIASWARN (wctomb);
  #endif
  
  
-#endif /* _GL_STDLIB_H */
-#endif /* _GL_STDLIB_H */
+#endif /* _@GUARD_PREFIX@_STDLIB_H */
+#endif /* _@GUARD_PREFIX@_STDLIB_H */
  #endif
diff --git a/lib/string.in.h b/lib/string.in.h

index eef9db04a2e1165a2e0c7d9c2821ddcc94f5c8d6..3b3993dd6a16c1881c8fc2ab61e4f6c57b20b027 100644 (file)
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_STRING_H
+#ifndef _@GUARD_PREFIX@_STRING_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_STRING_H@
  
-#ifndef _GL_STRING_H
-#define _GL_STRING_H
+#ifndef _@GUARD_PREFIX@_STRING_H
+#define _@GUARD_PREFIX@_STRING_H
  
  /* NetBSD 5.0 mis-defines NULL.  */
  #include <stddef.h>
@@ -977,5 +977,5 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp is unportable - "
  #endif
  
  
-#endif /* _GL_STRING_H */
-#endif /* _GL_STRING_H */
+#endif /* _@GUARD_PREFIX@_STRING_H */
+#endif /* _@GUARD_PREFIX@_STRING_H */
diff --git a/lib/strings.in.h b/lib/strings.in.h

index 7034c23cd2fc0c4b68dd743818982937c6acdb07..ba5a1d894381eb199a6a31b9154ef9e953108431 100644 (file)
--- a/lib/strings.in.h
+++ b/lib/strings.in.h
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_STRINGS_H
+#ifndef _@GUARD_PREFIX@_STRINGS_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -26,8 +26,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_STRINGS_H@
  
-#ifndef _GL_STRINGS_H
-#define _GL_STRINGS_H
+#ifndef _@GUARD_PREFIX@_STRINGS_H
+#define _@GUARD_PREFIX@_STRINGS_H
  
  
  /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -90,5 +90,5 @@ _GL_WARN_ON_USE (strncasecmp, "strncasecmp cannot work correctly on character "
  }
  #endif
  
-#endif /* _GL_STRING_H */
-#endif /* _GL_STRING_H */
+#endif /* _@GUARD_PREFIX@_STRING_H */
+#endif /* _@GUARD_PREFIX@_STRING_H */
diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h

index bee3098829cfb0950103d67f0840ccd208edd9cd..1e10dae7168480cd2e645fcf0e63d343349f781b 100644 (file)
--- a/lib/sys_file.in.h
+++ b/lib/sys_file.in.h
@@ -18,7 +18,7 @@
  
  /* Written by Richard W.M. Jones.  */
  
-#ifndef _GL_SYS_FILE_H
+#ifndef _@GUARD_PREFIX@_SYS_FILE_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -30,8 +30,8 @@
  # @INCLUDE_NEXT@ @NEXT_SYS_FILE_H@
  #endif
  
-#ifndef _GL_SYS_FILE_H
-#define _GL_SYS_FILE_H
+#ifndef _@GUARD_PREFIX@_SYS_FILE_H
+#define _@GUARD_PREFIX@_SYS_FILE_H
  
  #ifndef LOCK_SH
  /* Operations for the 'flock' call (same as Linux kernel constants).  */
@@ -60,5 +60,5 @@ _GL_WARN_ON_USE (flock, "flock is unportable - "
  #endif
  
  
-#endif /* _GL_SYS_FILE_H */
-#endif /* _GL_SYS_FILE_H */
+#endif /* _@GUARD_PREFIX@_SYS_FILE_H */
+#endif /* _@GUARD_PREFIX@_SYS_FILE_H */
diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h

index a01c266e531a816b162c436da2ededcaabcac1d0..5ed764ee42b8ea27a76532d52e6e96488b07919a 100644 (file)
--- a/lib/sys_ioctl.in.h
+++ b/lib/sys_ioctl.in.h
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_SYS_IOCTL_H
+#ifndef _@GUARD_PREFIX@_SYS_IOCTL_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -27,8 +27,8 @@
  # @INCLUDE_NEXT@ @NEXT_SYS_IOCTL_H@
  #endif
  
-#ifndef _GL_SYS_IOCTL_H
-#define _GL_SYS_IOCTL_H
+#ifndef _@GUARD_PREFIX@_SYS_IOCTL_H
+#define _@GUARD_PREFIX@_SYS_IOCTL_H
  
  /* AIX 5.1 and Solaris 10 declare ioctl() in <unistd.h> and in <stropts.h>,
     but not in <sys/ioctl.h>.
@@ -75,5 +75,5 @@ _GL_WARN_ON_USE (ioctl, "ioctl does not portably work on sockets - "
  #endif
  
  
-#endif /* _GL_SYS_IOCTL_H */
-#endif /* _GL_SYS_IOCTL_H */
+#endif /* _@GUARD_PREFIX@_SYS_IOCTL_H */
+#endif /* _@GUARD_PREFIX@_SYS_IOCTL_H */
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h

index acc0352eefeb3d402102b7906fc4c0b88bad9339..1255a19ff09f16aa2c109e4879ffb9f8599465c4 100644 (file)
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -34,7 +34,7 @@
  
  #else
  
-#ifndef _GL_SYS_SELECT_H
+#ifndef _@GUARD_PREFIX@_SYS_SELECT_H
  
  #if @HAVE_SYS_SELECT_H@
  
@@ -64,8 +64,8 @@
  
  #endif
  
-#ifndef _GL_SYS_SELECT_H
-#define _GL_SYS_SELECT_H
+#ifndef _@GUARD_PREFIX@_SYS_SELECT_H
+#define _@GUARD_PREFIX@_SYS_SELECT_H
  
  #if !@HAVE_SYS_SELECT_H@
  /* A platform that lacks <sys/select.h>.  */
@@ -115,6 +115,6 @@ _GL_WARN_ON_USE (select, "select is not always POSIX compliant - "
  #endif
  
  
-#endif /* _GL_SYS_SELECT_H */
-#endif /* _GL_SYS_SELECT_H */
+#endif /* _@GUARD_PREFIX@_SYS_SELECT_H */
+#endif /* _@GUARD_PREFIX@_SYS_SELECT_H */
  #endif /* OSF/1 */
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h

index 78026697bd71add1d6ed6ad638a8542cfcdb5a5d..72d1150b7288af91026a55f73c91df4242493f8d 100644 (file)
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -40,7 +40,7 @@
  #else
  /* Normal invocation convention.  */
  
-#ifndef _GL_SYS_SOCKET_H
+#ifndef _@GUARD_PREFIX@_SYS_SOCKET_H
  
  #if @HAVE_SYS_SOCKET_H@
  
@@ -61,8 +61,8 @@
  
  #endif
  
-#ifndef _GL_SYS_SOCKET_H
-#define _GL_SYS_SOCKET_H
+#ifndef _@GUARD_PREFIX@_SYS_SOCKET_H
+#define _@GUARD_PREFIX@_SYS_SOCKET_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -224,7 +224,7 @@ rpl_fd_isset (SOCKET fd, fd_set * set)
  
  /* Wrap everything else to use libc file descriptors for sockets.  */
  
-#if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+#if @HAVE_WINSOCK2_H@ && !defined _@GUARD_PREFIX@_UNISTD_H
  # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
  #  undef close
  #  define close close_used_without_including_unistd_h
@@ -234,7 +234,7 @@ rpl_fd_isset (SOCKET fd, fd_set * set)
  # endif
  #endif
  
-#if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+#if @HAVE_WINSOCK2_H@ && !defined _@GUARD_PREFIX@_UNISTD_H
  # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
  #  undef gethostname
  #  define gethostname gethostname_used_without_including_unistd_h
@@ -676,6 +676,6 @@ _GL_WARN_ON_USE (accept4, "accept4 is unportable - "
  # endif
  #endif
  
-#endif /* _GL_SYS_SOCKET_H */
-#endif /* _GL_SYS_SOCKET_H */
+#endif /* _@GUARD_PREFIX@_SYS_SOCKET_H */
+#endif /* _@GUARD_PREFIX@_SYS_SOCKET_H */
  #endif
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h

index 412261303701cf19c74b9ac3284fcc73b771d517..53b30811a433e6fa255a01de3f1728f870f092ef 100644 (file)
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -34,7 +34,7 @@
  #else
  /* Normal invocation convention.  */
  
-#ifndef _GL_SYS_STAT_H
+#ifndef _@GUARD_PREFIX@_SYS_STAT_H
  
  /* Get nlink_t.  */
  #include <sys/types.h>
@@ -45,8 +45,8 @@
  /* The include_next requires a split double-inclusion guard.  */
  #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
  
-#ifndef _GL_SYS_STAT_H
-#define _GL_SYS_STAT_H
+#ifndef _@GUARD_PREFIX@_SYS_STAT_H
+#define _@GUARD_PREFIX@_SYS_STAT_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -653,6 +653,6 @@ _GL_WARN_ON_USE (utimensat, "utimensat is not portable - "
  #endif
  
  
-#endif /* _GL_SYS_STAT_H */
-#endif /* _GL_SYS_STAT_H */
+#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
+#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
  #endif
diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h

index d11a53a4d9eeeaee5ca254b9d3ec4972874067f4..ce70370b571651a3be33fbc639164718e1736f0f 100644 (file)
--- a/lib/sys_time.in.h
+++ b/lib/sys_time.in.h
@@ -23,7 +23,7 @@
  #endif
  @PRAGMA_COLUMNS@
  
-#if defined _GL_SYS_TIME_H
+#if defined _@GUARD_PREFIX@_SYS_TIME_H
  
  /* Simply delegate to the system's header, without adding anything.  */
  # if @HAVE_SYS_TIME_H@
@@ -32,7 +32,7 @@
  
  #else
  
-# define _GL_SYS_TIME_H
+# define _@GUARD_PREFIX@_SYS_TIME_H
  
  # if @HAVE_SYS_TIME_H@
  #  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
@@ -98,4 +98,4 @@ _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
  #  endif
  # endif
  
-#endif /* _GL_SYS_TIME_H */
+#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h

index 7b661408a7fb4db894b7abbef146ad32167c144a..413a3730e417006d0651884e93d72712a07ba665 100644 (file)
--- a/lib/sys_times.in.h
+++ b/lib/sys_times.in.h
@@ -20,7 +20,7 @@
  /* This file is supposed to be used on platforms where <sys/times.h>
     is missing.  */
  
-#ifndef _GL_SYS_TIMES_H
+#ifndef _@GUARD_PREFIX@_SYS_TIMES_H
  
  # if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -31,7 +31,7 @@
  #  @INCLUDE_NEXT@ @NEXT_SYS_TIMES_H@
  # endif
  
-# define _GL_SYS_TIMES_H
+# define _@GUARD_PREFIX@_SYS_TIMES_H
  
  /* Get clock_t.
     But avoid namespace pollution on glibc systems.  */
@@ -78,4 +78,4 @@ _GL_WARN_ON_USE (times, "times is unportable - "
  }
  # endif
  
-#endif                          /* _GL_SYS_TIMES_H */
+#endif                          /* _@GUARD_PREFIX@_SYS_TIMES_H */
diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h

index 0eaff612a36e5ef32acb66ea0e1fd3310fd24728..e043d02b8e492c7a7a538bc51506ffe6b877caa3 100644 (file)
--- a/lib/sys_uio.in.h
+++ b/lib/sys_uio.in.h
@@ -20,7 +20,7 @@
  # endif
  @PRAGMA_COLUMNS@
  
-#ifndef _GL_SYS_UIO_H
+#ifndef _@GUARD_PREFIX@_SYS_UIO_H
  
  #if @HAVE_SYS_UIO_H@
  
@@ -32,8 +32,8 @@
  
  #endif
  
-#ifndef _GL_SYS_UIO_H
-#define _GL_SYS_UIO_H
+#ifndef _@GUARD_PREFIX@_SYS_UIO_H
+#define _@GUARD_PREFIX@_SYS_UIO_H
  
  #if !@HAVE_SYS_UIO_H@
  /* A platform that lacks <sys/uio.h>.  */
@@ -60,5 +60,5 @@ struct iovec {
  
  #endif
  
-#endif /* _GL_SYS_UIO_H */
-#endif /* _GL_SYS_UIO_H */
+#endif /* _@GUARD_PREFIX@_SYS_UIO_H */
+#endif /* _@GUARD_PREFIX@_SYS_UIO_H */
diff --git a/lib/sys_utsname.in.h b/lib/sys_utsname.in.h

index a8c8d29eeb0d76fdd1baad4ddf575f1f24d625ae..cc4dca01edd781a01c4e09cee3c76e149f5114e6 100644 (file)
--- a/lib/sys_utsname.in.h
+++ b/lib/sys_utsname.in.h
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_SYS_UTSNAME_H
+#ifndef _@GUARD_PREFIX@_SYS_UTSNAME_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -26,7 +26,7 @@
  # @INCLUDE_NEXT@ @NEXT_SYS_UTSNAME_H@
  #endif
  
-#define _GL_SYS_UTSNAME_H
+#define _@GUARD_PREFIX@_SYS_UTSNAME_H
  
  /* The definition of _GL_ARG_NONNULL is copied here.  */
  
@@ -98,4 +98,4 @@ _GL_WARN_ON_USE (uname, "uname is unportable - "
  #endif
  
  
-#endif /* _GL_SYS_UTSNAME_H */
+#endif /* _@GUARD_PREFIX@_SYS_UTSNAME_H */
diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h

index 20ec56a48f45bc5d39810d6f06ac04c1f3faecd8..e31be9cbac28bab8bd4a038e7c297b0921340f7f 100644 (file)
--- a/lib/sys_wait.in.h
+++ b/lib/sys_wait.in.h
@@ -16,7 +16,7 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
  
-#ifndef _GL_SYS_WAIT_H
+#ifndef _@GUARD_PREFIX@_SYS_WAIT_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -28,8 +28,8 @@
  # @INCLUDE_NEXT@ @NEXT_SYS_WAIT_H@
  #endif
  
-#ifndef _GL_SYS_WAIT_H
-#define _GL_SYS_WAIT_H
+#ifndef _@GUARD_PREFIX@_SYS_WAIT_H
+#define _@GUARD_PREFIX@_SYS_WAIT_H
  
  /* Get pid_t.  */
  #include <sys/types.h>
@@ -126,5 +126,5 @@ _GL_WARN_ON_USE (waitpid, "waitpid is unportable - "
  #endif
  
  
-#endif /* _GL_SYS_WAIT_H */
-#endif /* _GL_SYS_WAIT_H */
+#endif /* _@GUARD_PREFIX@_SYS_WAIT_H */
+#endif /* _@GUARD_PREFIX@_SYS_WAIT_H */
diff --git a/lib/sysexits.in.h b/lib/sysexits.in.h

index d45fbae21ede9504ca8496f0df099607d01b0155..f925b6948e3d98604e0e2991352485963d1204d4 100644 (file)
--- a/lib/sysexits.in.h
+++ b/lib/sysexits.in.h
@@ -16,7 +16,7 @@
  
  /* Written by Simon Josefsson based on sysexits(3) man page */
  
-#ifndef _GL_SYSEXITS_H
+#ifndef _@GUARD_PREFIX@_SYSEXITS_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -43,8 +43,8 @@
  
  #endif
  
-#ifndef _GL_SYSEXITS_H
-#define _GL_SYSEXITS_H
+#ifndef _@GUARD_PREFIX@_SYSEXITS_H
+#define _@GUARD_PREFIX@_SYSEXITS_H
  
  #if !@HAVE_SYSEXITS_H@
  
@@ -68,5 +68,5 @@
  
  #endif
  
-#endif /* _GL_SYSEXITS_H */
-#endif /* _GL_SYSEXITS_H */
+#endif /* _@GUARD_PREFIX@_SYSEXITS_H */
+#endif /* _@GUARD_PREFIX@_SYSEXITS_H */
diff --git a/lib/termios.in.h b/lib/termios.in.h

index cc749d0b87fde16a4445a195947954e9b485ed75..f69786b3d22eac798d51f0a000aea7a142747993 100644 (file)
--- a/lib/termios.in.h
+++ b/lib/termios.in.h
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
-#ifndef _GL_TERMIOS_H
+#ifndef _@GUARD_PREFIX@_TERMIOS_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -38,8 +38,8 @@ extern "C" {
  # @INCLUDE_NEXT@ @NEXT_TERMIOS_H@
  #endif
  
-#ifndef _GL_TERMIOS_H
-#define _GL_TERMIOS_H
+#ifndef _@GUARD_PREFIX@_TERMIOS_H
+#define _@GUARD_PREFIX@_TERMIOS_H
  
  #if @GNULIB_TCGETSID@
  /* Get pid_t.  */
@@ -72,5 +72,5 @@ _GL_WARN_ON_USE (tcgetsid, "tcgetsid is not portable - "
  #endif
  
  
-#endif /* _GL_TERMIOS_H */
-#endif /* _GL_TERMIOS_H */
+#endif /* _@GUARD_PREFIX@_TERMIOS_H */
+#endif /* _@GUARD_PREFIX@_TERMIOS_H */
diff --git a/lib/time.in.h b/lib/time.in.h

index 54e7f429af12be3417cb86eebb0f039e3b15ec3e..ca852e811ecf7cf3001e555dbefe88a3c9c6c25d 100644 (file)
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -28,13 +28,13 @@
     without adding our own declarations.  */
  #if (defined __need_time_t || defined __need_clock_t \
       || defined __need_timespec \
-     || defined _GL_TIME_H)
+     || defined _@GUARD_PREFIX@_TIME_H)
  
  # @INCLUDE_NEXT@ @NEXT_TIME_H@
  
  #else
  
-# define _GL_TIME_H
+# define _@GUARD_PREFIX@_TIME_H
  
  # @INCLUDE_NEXT@ @NEXT_TIME_H@
  
diff --git a/lib/unistd.in.h b/lib/unistd.in.h

index 55965333c4383bc0d7f23d73ccd01cf577626c39..98ab6e655ba5fe107fe046bd946398a7a287da30 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -36,7 +36,7 @@
  # define _GL_WINSOCK2_H_WITNESS
  
  /* Normal invocation.  */
-#elif !defined _GL_UNISTD_H
+#elif !defined _@GUARD_PREFIX@_UNISTD_H
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_UNISTD_H@
@@ -51,8 +51,8 @@
  # undef _GL_INCLUDING_WINSOCK2_H
  #endif
  
-#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
-#define _GL_UNISTD_H
+#if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
+#define _@GUARD_PREFIX@_UNISTD_H
  
  /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
  #include <stddef.h>
@@ -120,7 +120,7 @@
  #if @GNULIB_GETHOSTNAME@
  /* Get all possible declarations of gethostname().  */
  # if @UNISTD_H_HAVE_WINSOCK2_H@
-#  if !defined _GL_SYS_SOCKET_H
+#  if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
  #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
  #    undef socket
  #    define socket              socket_used_without_including_sys_socket_h
@@ -181,7 +181,7 @@
                        "shutdown() used without including <sys/socket.h>");
  #   endif
  #  endif
-#  if !defined _GL_SYS_SELECT_H
+#  if !defined _@GUARD_PREFIX@_SYS_SELECT_H
  #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
  #    undef select
  #    define select              select_used_without_including_sys_select_h
@@ -1416,5 +1416,5 @@ _GL_CXXALIASWARN (write);
  #endif
  
  
-#endif /* _GL_UNISTD_H */
-#endif /* _GL_UNISTD_H */
+#endif /* _@GUARD_PREFIX@_UNISTD_H */
+#endif /* _@GUARD_PREFIX@_UNISTD_H */
diff --git a/lib/wchar.in.h b/lib/wchar.in.h

index c7f306a9c0c2115654affbd528062e38032c6078..f76f371ace52a288f2d481fbe3ee51a7dd82d9eb 100644 (file)
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -49,7 +49,7 @@
  #else
  /* Normal invocation convention.  */
  
-#ifndef _GL_WCHAR_H
+#ifndef _@GUARD_PREFIX@_WCHAR_H
  
  #define _GL_ALREADY_INCLUDING_WCHAR_H
  
@@ -81,8 +81,8 @@
  
  #undef _GL_ALREADY_INCLUDING_WCHAR_H
  
-#ifndef _GL_WCHAR_H
-#define _GL_WCHAR_H
+#ifndef _@GUARD_PREFIX@_WCHAR_H
+#define _@GUARD_PREFIX@_WCHAR_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -989,6 +989,6 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - "
  #endif
  
  
-#endif /* _GL_WCHAR_H */
-#endif /* _GL_WCHAR_H */
+#endif /* _@GUARD_PREFIX@_WCHAR_H */
+#endif /* _@GUARD_PREFIX@_WCHAR_H */
  #endif
diff --git a/lib/wctype.in.h b/lib/wctype.in.h

index feef37dbe37d0385163d49d0961b007ef83e9935..df98128f646f0e86ef93cba4387495c25d0e0196 100644 (file)
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -26,7 +26,7 @@
   * wctrans_t, and wctype_t are not yet implemented.
   */
  
-#ifndef _GL_WCTYPE_H
+#ifndef _@GUARD_PREFIX@_WCTYPE_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@ -52,8 +52,8 @@
  # @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
  #endif
  
-#ifndef _GL_WCTYPE_H
-#define _GL_WCTYPE_H
+#ifndef _@GUARD_PREFIX@_WCTYPE_H
+#define _@GUARD_PREFIX@_WCTYPE_H
  
  /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
  
@@ -466,5 +466,5 @@ _GL_WARN_ON_USE (towctrans, "towctrans is unportable - "
  #endif
  
  
-#endif /* _GL_WCTYPE_H */
-#endif /* _GL_WCTYPE_H */
+#endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif /* _@GUARD_PREFIX@_WCTYPE_H */
diff --git a/modules/arpa_inet b/modules/arpa_inet

index 365f36dbb6dc8fbea6d5da9394d6fb0705e266ce..c81ea371f1ab6be58b70b82fff696064b6a4d16b 100644 (file)
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -25,7 +25,8 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON
         $(AM_V_at)$(MKDIR_P) arpa
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
diff --git a/modules/assert-h b/modules/assert-h

index 50bd9f83e146d0b7b365641c3bd0e4c3f92d18ad..595fefe1e29003247c5b536db849031196e9cd13 100644 (file)
--- a/modules/assert-h
+++ b/modules/assert-h
@@ -26,7 +26,8 @@ assert.h: assert.in.h verify.h $(top_builddir)/config.status
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \
               < $(srcdir)/assert.in.h && \
-         sed -e 's|_gl_verify|_gl_static_assert|g' \
+         sed -e 's|_GL_VERIFY_H|_${gl_include_guard_prefix}_STATIC_ASSERT_H|g' \
+             -e 's|_gl_verify|_gl_static_assert|g' \
               -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \
               < $(srcdir)/verify.h; \
         } > $@-t && \
diff --git a/modules/ctype b/modules/ctype

index 8285218784649791ac55ef0b3c41bbd0d35053fb..277c1e4a96cfb9d6c5da4aacdfd1b5cc577ef8cc 100644 (file)
--- a/modules/ctype
+++ b/modules/ctype
@@ -21,7 +21,8 @@ BUILT_SOURCES += ctype.h
  ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_CTYPE_H''@|$(NEXT_CTYPE_H)|g' \
diff --git a/modules/dirent b/modules/dirent

index 94f53a970364797fed749a646e4d9564e488027a..1a6c482241267f738bc427b03d9719aa30910d95 100644 (file)
--- a/modules/dirent
+++ b/modules/dirent
@@ -23,7 +23,8 @@ BUILT_SOURCES += dirent.h
  dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
diff --git a/modules/errno b/modules/errno

index 95169015533ab42556824b85fc09554c15a9eb1e..2fee35d5b176903fe988205effdca6efcc4b4dfd 100644 (file)
--- a/modules/errno
+++ b/modules/errno
@@ -20,7 +20,8 @@ if GL_GENERATE_ERRNO_H
  errno.h: errno.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
diff --git a/modules/fcntl-h b/modules/fcntl-h

index 45593f6ef3613d34ca44e6476ffa979f87a77f02..9904fabc8cb896354e8400fed0937b914c3e5bd5 100644 (file)
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -25,7 +25,8 @@ BUILT_SOURCES += fcntl.h
  fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
diff --git a/modules/float b/modules/float

index 4a1c16a538dc259dc9ea01402a77358a6d918a7c..04601e2a0e4d3320fac6a7ba02facd9035e1051e 100644 (file)
--- a/modules/float
+++ b/modules/float
@@ -20,7 +20,8 @@ if GL_GENERATE_FLOAT_H
  float.h: float.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
diff --git a/modules/getopt-posix b/modules/getopt-posix

index 6be0cbce891c22f15e5a564228d46f47914a09ca..c99f8a4feb687b39fc26815234b67263c239e0bc 100644 (file)
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -26,7 +26,8 @@ BUILT_SOURCES += $(GETOPT_H)
  getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/iconv-h b/modules/iconv-h

index 82330f6d0079b9914330f82e12ec7b77ba8b8212..2156b48d0beccc8a2882ea514dbeff2c1f5d10ce 100644 (file)
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -23,7 +23,8 @@ if GL_GENERATE_ICONV_H
  iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
diff --git a/modules/langinfo b/modules/langinfo

index c2b239a21c726e4b85303b228ff2addde4bb28fb..ad963005a9d04069d6ae6860be601dcaa3d5e3f1 100644 (file)
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -22,7 +22,8 @@ BUILT_SOURCES += langinfo.h
  langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/locale b/modules/locale

index a565c03b135a0bf5de05bbf2c15170b302f35c57..fe1ef91fe649a1a70afea7ca26594718ef04f910 100644 (file)
--- a/modules/locale
+++ b/modules/locale
@@ -24,7 +24,8 @@ BUILT_SOURCES += locale.h
  locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
diff --git a/modules/math b/modules/math

index 6bc0d9ff68750a0efdd873ef55ae5a7ddd35750d..cc9e0eced87b502a1234540ce4c44654dac52e81 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -22,7 +22,8 @@ BUILT_SOURCES += math.h
  math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \
diff --git a/modules/netdb b/modules/netdb

index 59f26891d469a2e2fee205209d6ee6ff67639179..098f5f2059003ed7eb6da0dacc17b85331eaf996 100644 (file)
--- a/modules/netdb
+++ b/modules/netdb
@@ -23,7 +23,8 @@ BUILT_SOURCES += netdb.h
  netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \
diff --git a/modules/netinet_in b/modules/netinet_in

index da680810bc41e7c61a6d99908688aaafab87b543..7d09a3761bc0c6282ed9fc3727e1ac00b466f31f 100644 (file)
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -23,7 +23,8 @@ netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
         $(AM_V_at)$(MKDIR_P) netinet
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
diff --git a/modules/poll-h b/modules/poll-h

index 8673fe412a1f4795bafc15fd064f1b38d554a43e..026b95ec1dc278a1f57f78d35754cb314b025943 100644 (file)
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -22,7 +22,8 @@ BUILT_SOURCES += poll.h
  poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/pthread b/modules/pthread

index 3a00c772140225727c9d01832ac1678d3678f508..eef4b07165505cba27dcd8e778aaabdf90d6f6c9 100644 (file)
--- a/modules/pthread
+++ b/modules/pthread
@@ -21,7 +21,8 @@ if GL_GENERATE_PTHREAD_H
  pthread.h: pthread.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/pty b/modules/pty

index 8be8e02e52c8dffb542a0babc932fadbf8723a50..2266944bc9dd6eba20b5cc13ed422c48d028a247 100644 (file)
--- a/modules/pty
+++ b/modules/pty
@@ -21,7 +21,8 @@ BUILT_SOURCES += pty.h
  pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/sched b/modules/sched

index e0a3936b2ec5b0c56014227bb3f3a889b729a9b1..9f9c5c9facae15473964530576b83d74892ceeb3 100644 (file)
--- a/modules/sched
+++ b/modules/sched
@@ -20,7 +20,8 @@ if GL_GENERATE_SCHED_H
  sched.h: sched.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/search b/modules/search

index 4650d3191a183b27108a2a1ca2ad382b4491ca69..cb049861d4760273117a64e8aa8eeefc2a1f5fe1 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -22,7 +22,8 @@ BUILT_SOURCES += search.h
  search.h: search.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/selinux-h b/modules/selinux-h

index 66429f7b50e34768d925c0caa1f319dac5d6f735..5cdc91a6a4aed8337bc8ef4e62792999e75d3f72 100644 (file)
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -25,7 +25,8 @@ selinux/selinux.h: se-selinux.in.h $(top_builddir)/config.status $(UNUSED_PARAME
         $(AM_V_at)$(MKDIR_P) selinux
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SELINUX_SELINUX_H''@|$(NEXT_SELINUX_SELINUX_H)|g' \
diff --git a/modules/signal b/modules/signal

index c8d93a1dc0d572a6a3e29eb7521c663149340af4..805471fd9e1e87e0e733027a76006a854c175d68 100644 (file)
--- a/modules/signal
+++ b/modules/signal
@@ -23,7 +23,8 @@ BUILT_SOURCES += signal.h
  signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
diff --git a/modules/spawn b/modules/spawn

index f133422cbc6528fc14550ebe8755f1d847866e57..9c164dd3024a6f4b76c6bd8237418b83013371c9 100644 (file)
--- a/modules/spawn
+++ b/modules/spawn
@@ -23,7 +23,8 @@ BUILT_SOURCES += spawn.h
  spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/stdarg b/modules/stdarg

index 6cb1db86446f5a4ceffaa2c611f717d6ea844558..84d3e7b44f2dbd46be7a795f201db29c54597b16 100644 (file)
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -27,7 +27,8 @@ if GL_GENERATE_STDARG_H
  stdarg.h: stdarg.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
diff --git a/modules/stddef b/modules/stddef

index 94b57da9b0ba3bafaa1442a6ff2903c78261d12d..fd4cf503d0c44aa05f2b907e03ec76df3b2bfcba 100644 (file)
--- a/modules/stddef
+++ b/modules/stddef
@@ -21,7 +21,8 @@ if GL_GENERATE_STDDEF_H
  stddef.h: stddef.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
diff --git a/modules/stdint b/modules/stdint

index c11825a12e46103d0d7e23293330d939dfb0c8b1..92eb59f94860a396a524c2882093112d9cdd267a 100644 (file)
--- a/modules/stdint
+++ b/modules/stdint
@@ -27,7 +27,8 @@ if GL_GENERATE_STDINT_H
  stdint.h: stdint.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/stdio b/modules/stdio

index 376e75f1f512ece40c025b6fe3503643eee7ed73..9c4cdc194ae9e6707209449b1f95087e7215251c 100644 (file)
--- a/modules/stdio
+++ b/modules/stdio
@@ -23,7 +23,8 @@ BUILT_SOURCES += stdio.h
  stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
diff --git a/modules/stdlib b/modules/stdlib

index a24a5930397e7fb322b99dbb07f4a36fedf2e22a..bc0b990f9bff5d537a31094104a232aefa3572b2 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -24,7 +24,8 @@ BUILT_SOURCES += stdlib.h
  stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
diff --git a/modules/string b/modules/string

index a88bdce00a06f2eee609823e36bec0d11035c619..9abf33fe444854866e3a8066899bfa014bcd51c6 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -24,7 +24,8 @@ BUILT_SOURCES += string.h
  string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
diff --git a/modules/strings b/modules/strings

index 6019f5dc9d5d67a90b53f08990ef3f73a5ce9ba6..30d2a3976d7dcb33a8cce1861133de0f4c7d3cf1 100644 (file)
--- a/modules/strings
+++ b/modules/strings
@@ -21,7 +21,8 @@ BUILT_SOURCES += strings.h
  strings.h: strings.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
diff --git a/modules/sys_file b/modules/sys_file

index fdfba45ddbb6a6c7128f064197c8eb794e2cf76c..71df037547af6603b0bf806f839b03cfca9f2210 100644 (file)
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -22,7 +22,8 @@ sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H)
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/sys_ioctl b/modules/sys_ioctl

index d0130dafa6f6c8129a532a791a15ab6d97d6f37c..74d9e1a458f8704b63379de398b941911db3b1ca 100644 (file)
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -24,7 +24,8 @@ sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/sys_select b/modules/sys_select

index 79a8581105fcd17e4a43bb6b0f6a7222dac9036d..c5c0c3b4697a1e702c65f1fee99b476443c197d6 100644 (file)
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -25,7 +25,8 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
diff --git a/modules/sys_socket b/modules/sys_socket

index f5cd1f7d0c1a91659c7f5de58809f4ac7c3bd0c6..323214693540c1dd931d1cf35b2018a109246f32 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -29,7 +29,8 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
diff --git a/modules/sys_stat b/modules/sys_stat

index 7971617570713988fd87080df87ec772bc42db52..4aba0e0b499f8854972d15e6174f6d5178f8a78a 100644 (file)
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -26,7 +26,8 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
diff --git a/modules/sys_time b/modules/sys_time

index b2c39142315606794a0f6960e5b24e93007df47e..6e2b33a1970e1bb635d1d63f4117368a83225803 100644 (file)
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -24,7 +24,8 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/sys_times b/modules/sys_times

index 5905285b3f62fd9d29a57fe4a630ebf38e776d8b..267787760b6cd358e38a4302a3e5c24739039e53 100644 (file)
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -23,7 +23,8 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/sys_uio b/modules/sys_uio

index 2152718ccaf74567fe04bbc634b398a8ee8a22ce..b6ca3d82dd803af17393ac99872cf9c492068f5b 100644 (file)
--- a/modules/sys_uio
+++ b/modules/sys_uio
@@ -21,7 +21,8 @@ sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \
diff --git a/modules/sys_utsname b/modules/sys_utsname

index 0bfafd4042f898966db5c195f5c403939532ee48..6f2b22154150f75d1cca818b2186d286158af32b 100644 (file)
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -23,7 +23,8 @@ sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/sys_wait b/modules/sys_wait

index a6395e4e471edea03fdb4068a40fbe562d5e36ab..348225cf48e60e61c05bdd73efbc1836a5ebc546 100644 (file)
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -23,7 +23,8 @@ sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
         $(AM_V_at)$(MKDIR_P) sys
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
diff --git a/modules/sysexits b/modules/sysexits

index 5f6896a586e7ba6215f1a058f40af64a7d28dd4a..64236a2ccc2ad597b92eecab3e8f7d877de33316 100644 (file)
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -21,7 +21,8 @@ if GL_GENERATE_SYSEXITS_H
  sysexits.h: sysexits.in.h $(top_builddir)/config.status
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/termios b/modules/termios

index ec3f6fc5d381dd2f9ad118774f2d307cd55e25dc..9d56f4d87e16f649798ed1f47ddeae212893a4a0 100644 (file)
--- a/modules/termios
+++ b/modules/termios
@@ -21,7 +21,8 @@ BUILT_SOURCES += termios.h
  termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \
diff --git a/modules/time b/modules/time

index 9660144fb490403fc0f4158fc3d204adce2cb789..a52187a8e68e1097c2399007d05993140054b96a 100644 (file)
--- a/modules/time
+++ b/modules/time
@@ -24,7 +24,8 @@ BUILT_SOURCES += time.h
  time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
diff --git a/modules/unistd b/modules/unistd

index c9a9b76b78261385b316a6716ee57b0d3083ea8d..673cb47938aa05bf3965b02e5bc8ba01e2c755c7 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -23,7 +23,8 @@ BUILT_SOURCES += unistd.h
  unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
diff --git a/modules/wchar b/modules/wchar

index 855d18db388597e8b9bd5514effb0c7e31f6b4f8..3ae8f4bfdc4fd9ff530eb8c4e7298cf1bd23809a 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -24,7 +24,8 @@ BUILT_SOURCES += wchar.h
  wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
diff --git a/modules/wctype-h b/modules/wctype-h

index 30c5ceaeed8a0357823f01f770db284a3a0ae2bc..20f773ec8d6d6515ebc073bd6d0ee57e6247cd19 100644 (file)
--- a/modules/wctype-h
+++ b/modules/wctype-h
@@ -22,7 +22,8 @@ BUILT_SOURCES += wctype.h
  wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
author	Bruno Haible <bruno@clisp.org>
	Sun, 29 May 2011 13:44:42 +0000 (15:44 +0200)
committer	Bruno Haible <bruno@clisp.org>
	Sun, 29 May 2011 13:44:42 +0000 (15:44 +0200)
ChangeLog		patch \| blob \| history
STATUS-libposix		patch \| blob \| history
gnulib-tool		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/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_uio.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
modules/arpa_inet		patch \| blob \| history
modules/assert-h		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/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_uio		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-h		patch \| blob \| history