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>.

diff --git a/ChangeLog b/ChangeLog
index acf980b7bb233e7cd1b000c62700a6447de50eda..25790a619de667d1b1d7c1cf66f7774787554c0a 100644 (file)
--- 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

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 6fe75d330fae7ac7bfb64b6eee4b53174ea7cde5..e6dcdbc8412a014cce5a4d6215d6b13fb884620d 100644 (file)
--- 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 @@ 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__)