Fix build failure with glibc-2.16.

* lib/gnulib.mk:
* lib/stdio.in.h:
* m4/stdio_h.m4: Do not assume that gets is defined.

Fixes: debbugs:11873

2 files changed, 5 insertions, 17 deletions

diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index 154ae9882da..781027d6e7a 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -599,7 +599,6 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
               -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
               -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-              -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
               -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index ce00af574a8..1920830cc14 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -699,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
 # endif
 #endif
 
-#if @GNULIB_GETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gets
-#   define gets rpl_gets
-#  endif
-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gets, char *, (char *s));
-# else
-_GL_CXXALIAS_SYS (gets, char *, (char *s));
-#  undef gets
-# endif
-_GL_CXXALIASWARN (gets);
 /* It is very rare that the developer ever has full control of stdin,
-   so any use of gets warrants an unconditional warning.  Assume it is
-   always declared, since it is required by C89.  */
+   so any use of gets warrants an unconditional warning.  Besides, C11
+   removed it.  */
+#undef gets
+#if HAVE_RAW_DECL_GETS
 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 #endif
 
@@ -1054,7 +1043,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
 # endif
 #endif
 
-/* Some people would argue that sprintf should be handled like gets
+/* Some people would argue that sprintf uses should be warned about
    (for example, OpenBSD issues a link warning for both functions),
    since both can cause security holes due to buffer overruns.
    However, we believe that sprintf can be used safely, and is more