Change the test for native Windows.

diff --git a/ChangeLog b/ChangeLog
index fa44475568948ee26058b068411d629aad7e4bfe..99133b4e56551b5e1b25da6e336399a091b0a0ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-13  Bruno Haible  <bruno@clisp.org>
+
+       * tests/test-poll.c: Use #if for native Windows, rather than testing
+       __MSVCRT__.
+
 2008-09-13  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/tests/test-poll.c b/tests/test-poll.c
index 1f66a63857cb64c32e634769e61449ce92aa238a..5e8d70614feb4490df94a95e11d3237b14bea956 100644 (file)
--- a/tests/test-poll.c
+++ b/tests/test-poll.c
@@ -31,7 +31,11 @@
 #include <errno.h>
 #include "sockets.h"
 
-#ifdef __MSVCRT__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WIN32_NATIVE
+#endif
+
+#ifdef WIN32_NATIVE
 #include <io.h>
 #define pipe(x) _pipe(x, 256, O_BINARY)
 #endif
@@ -123,7 +127,7 @@ connect_to_socket (int blocking)
 
   if (!blocking)
     {
-#ifdef __MSVCRT__
+#ifdef WIN32_NATIVE
       unsigned long iMode = 1;
       ioctlsocket (s, FIONBIO, (void *) &iMode);
  
@@ -241,7 +245,7 @@ test_connect_first (void)
 static void
 test_accept_first (void)
 {
-#ifndef __MSVCRT__
+#ifndef WIN32_NATIVE
   int s = open_server_socket ();
   struct sockaddr_in ia;
   socklen_t addrlen;