annotate src/libiconv-1-fix.patch @ 4037:85abb6c3ec8b

of-netcdf: patch for --enable-64 (Bug #46060) * src/of-netcdf-1-fixes.patch: new file * dist-files.mk: add of-netcdf-1-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 29 Sep 2015 19:43:19 -0400
parents cc8bf1ca8fb2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3119
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/srclib/stdio.in.h b/srclib/stdio.in.h
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/srclib/stdio.in.h 2011-08-07 09:42:06.000000000 -0400
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/srclib/stdio.in.h 2013-07-01 18:48:58.875038466 -0400
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -679,22 +679,11 @@
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 # endif
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 #endif
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -#if @GNULIB_GETS@
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 -# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 -# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 -# undef gets
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 -# define gets rpl_gets
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 -# endif
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 -_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 -_GL_CXXALIAS_RPL (gets, char *, (char *s));
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 -# else
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 -_GL_CXXALIAS_SYS (gets, char *, (char *s));
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 -# undef gets
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 -# endif
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 -_GL_CXXALIASWARN (gets);
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 /* It is very rare that the developer ever has full control of stdin,
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 so any use of gets warrants an unconditional warning. Assume it is
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 always declared, since it is required by C89. */
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 +#undef gets
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 +#if HAVE_RAW_DECL_GETS
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 #endif
cc8bf1ca8fb2 fix gnulib gets bug in libiconv
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28