Mercurial > hg > octave-nkf > gnulib-hg
changeset 13796:f93a5e80c44f
stdlib: Allow multiple gnulib generated replacements to coexist.
* lib/stdlib.in.h (struct random_data): Avoid identical redefinition.
Reported by Sam Steingold <sds@gnu.org>.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 12 Oct 2010 00:38:19 +0200 |
parents | 837d918f9552 |
children | 3b020b6c988f 25daaadfa3d0 |
files | ChangeLog lib/stdlib.in.h |
diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-11 Bruno Haible <bruno@clisp.org> + + stdlib: Allow multiple gnulib generated replacements to coexist. + * lib/stdlib.in.h (struct random_data): Avoid identical redefinition. + Reported by Sam Steingold <sds@gnu.org>. + 2010-10-11 Jim Meyering <meyering@redhat.com> fix a documentation typo
--- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -61,6 +61,9 @@ #endif #if !@HAVE_STRUCT_RANDOM_DATA@ +/* Define 'struct random_data'. + But allow multiple gnulib generated <stdlib.h> replacements to coexist. */ +# if !GNULIB_defined_struct_random_data struct random_data { int32_t *fptr; /* Front pointer. */ @@ -71,6 +74,8 @@ int rand_sep; /* Distance between front and rear. */ int32_t *end_ptr; /* Pointer behind state table. */ }; +# define GNULIB_defined_struct_random_data 1 +# endif #endif #if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)