stdlib: Avoid compilation failure of c-strtold on mingw.

diff --git a/ChangeLog b/ChangeLog
index 449a195..9d33077 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-03  Bruno Haible  <bruno@clisp.org>
 
+       stdlib: Avoid compilation failure of c-strtold on mingw.
+       * lib/stdlib.in.h: Don't include <unistd.h> on native Windows systems.
+
+2010-04-03  Bruno Haible  <bruno@clisp.org>
+
        locale: Make C++ tests work on Cygwin and mingw.
        * lib/locale.in.h (duplocale): Don't use _GL_CXXALIASWARN if gnulib
        cannot provide the function.

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 3a87245..5c7c3f0 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -67,10 +67,10 @@ struct random_data
 };
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__
+#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 /* 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.  */
+/* But avoid namespace pollution on glibc systems and native Windows.  */
 # include <unistd.h>
 #endif