changeset 18008:1de438ccf7a3

stdio: Don't redefine gets when using C++ We've hit this failure a few times in pkgsrc with packages which embed gnulib, an example being the latest gnutls: ../../src/gl/stdio.h:1034:1: error: 'char* gets(char*)' conflicts with a previous declaration _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ^ /opt/tools/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.2/include-fixed/iso/stdio_iso.h:259:14: note: previous declaration 'char* std::gets(char*)' extern char *gets(char *); ^ Full build log is here: http://us-east.manta.joyent.com/pkgsrc/public/reports/upstream-trunk32/20150602.2233/gnutls-3.3.15/build.log We've fixed it a few different ways over time: https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/devel/m4/patches/patch-lib_stdio.in.h https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/math/octave/patches/patch-libgnu_stdio.in.h https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/security/gnutls/patches/patch-gl_stdio.in.h but the cleanest fix appears to be the last, so I am proposing it here for inclusion upstream. Message-Id: <20150604111034.GG66573@joyent.com> Signed-off-by: Eric Blake <eblake@redhat.com>
author Jonathan Perkin <jperkin@joyent.com>
date Thu, 04 Jun 2015 12:10:34 +0100
parents c4b5318623b4
children 9d5c839f66b6
files ChangeLog lib/stdio.in.h
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 05 08:20:21 2015 -0700
+++ b/ChangeLog	Thu Jun 04 12:10:34 2015 +0100
@@ -1,3 +1,8 @@
+2015-06-05  Jonathan Perkin  <jperkin@joyent.com>  (tiny change)
+
+	stdio: Don't redefine gets when using C++
+	* lib/stdio.in.h (gets): Disable warning on C++.
+
 2015-06-05  Paul Eggert  <eggert@cs.ucla.edu>
 
 	acl-permissions: port to older AIX, C89 HP-UX
--- a/lib/stdio.in.h	Fri Jun 05 08:20:21 2015 -0700
+++ b/lib/stdio.in.h	Thu Jun 04 12:10:34 2015 +0100
@@ -723,11 +723,10 @@
    so any use of gets warrants an unconditional warning; besides, C11
    removed it.  */
 #undef gets
-#if HAVE_RAW_DECL_GETS
+#if HAVE_RAW_DECL_GETS && !defined __cplusplus
 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 #endif
 
-
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
 struct obstack;
 /* Grow an obstack with formatted output.  Return the number of