gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / modules / sys_ioctl

diff --git a/modules/sys_ioctl b/modules/sys_ioctl
index f5051be..a008f21 100644 (file)
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -7,31 +7,30 @@ m4/sys_ioctl_h.m4
 
 Depends-on:
 include_next
-c++defs
+snippet/c++defs
+snippet/warn-on-use
 unistd
-warn-on-use
 
 configure.ac:
 gl_SYS_IOCTL_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/ioctl.h
-
 BUILT_SOURCES += sys/ioctl.h
 
 # We need the following in order to create <sys/ioctl.h> when the system
 # does not have a complete one.
-sys/ioctl.h: sys_ioctl.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(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_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' \
              -e 's|@''NEXT_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \
-             -e 's|@''GNULIB_IOCTL''@|$(GNULIB_IOCTL)|g' \
+             -e 's/@''GNULIB_IOCTL''@/$(GNULIB_IOCTL)/g' \
              -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \
              -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
              -e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \