X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstdlib.in.h;h=edee74c4a221bc70d864dd3e5481c8356f3b7cfb;hb=d19dfc69437add5301e0e1dd28dbfda2c694cbbc;hp=5f2766a99fc9f6eacf41cef4f96a8bf9efadb0d9;hpb=70302e4b86816aea51eb21da522f75831fa7b993;p=gnulib.git

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 5f2766a99..edee74c4a 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -49,8 +49,8 @@
 # include <random.h>
 #endif
 
-#if (@GNULIB_RANDOM_R@ || !@HAVE_STRUCT_RANDOM_DATA@ \
-     || defined GNULIB_POSIXCHECK)
+#if !@HAVE_STRUCT_RANDOM_DATA@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@) \
+    || defined GNULIB_POSIXCHECK
 # include <stdint.h>
 #endif
 
@@ -67,9 +67,10 @@ struct random_data
 };
 #endif
 
-#if @GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK
+#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__
 /* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
+/* But avoid namespace pollution on glibc systems.  */
 # include <unistd.h>
 #endif