From e70b0dfb6c430c1ab6d65b88e475ebb01c7ac2fe Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 12 Oct 2010 00:38:19 +0200 Subject: [PATCH] stdlib: Allow multiple gnulib generated replacements to coexist. * lib/stdlib.in.h (struct random_data): Avoid identical redefinition. Reported by Sam Steingold . --- ChangeLog | 6 ++++++ lib/stdlib.in.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index acf980b7b..25790a619 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-11 Bruno Haible + + stdlib: Allow multiple gnulib generated replacements to coexist. + * lib/stdlib.in.h (struct random_data): Avoid identical redefinition. + Reported by Sam Steingold . + 2010-10-11 Jim Meyering fix a documentation typo diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 6fe75d330..e6dcdbc84 100644 --- 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 replacements to coexist. */ +# if !GNULIB_defined_struct_random_data struct random_data { int32_t *fptr; /* Front pointer. */ @@ -71,6 +74,8 @@ struct random_data 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__) -- 2.11.0