From 1d479cbc830c7a1becb21cd362123e49fa7dfb40 Mon Sep 17 00:00:00 2001
From: gnorton <gnorton@e3ebcda4-bce8-0310-ba0a-eca2169e7518>
Date: Tue, 1 Jun 2010 19:33:48 +0000
Subject: [PATCH] 2010-06-01  Geoff Norton  <gnorton@novell.com>

        * sockets.c: Don't call poll directly, use mono_poll.

git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@158299 e3ebcda4-bce8-0310-ba0a-eca2169e7518
---
 mono/io-layer/ChangeLog | 4 ++++
 mono/io-layer/sockets.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index 6cf064212..eb921e7a3 100644
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-01  Geoff Norton  <gnorton@novell.com>
+
+	* sockets.c: Don't call poll directly, use mono_poll.
+
 2010-04-29  Geoff Norton  <gnorton@novell.com>
 
 	* mono-spinlock.h: Remove
diff --git a/mono/io-layer/sockets.c b/mono/io-layer/sockets.c
index 8e787209b..edb8e3aad 100644
--- a/mono/io-layer/sockets.c
+++ b/mono/io-layer/sockets.c
@@ -20,7 +20,6 @@
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif
-#include <sys/poll.h>
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>     /* defines FIONBIO and FIONREAD */
 #endif
@@ -39,6 +38,7 @@
 #include <mono/io-layer/socket-private.h>
 #include <mono/io-layer/handles-private.h>
 #include <mono/io-layer/socket-wrappers.h>
+#include <mono/utils/mono-poll.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -311,7 +311,7 @@ int _wapi_connect(guint32 fd, const struct sockaddr *serv_addr,
 	}
 	
 	if (connect (fd, serv_addr, addrlen) == -1) {
-		struct pollfd fds;
+		mono_pollfd fds;
 		int so_error;
 		socklen_t len;
 		
@@ -352,7 +352,7 @@ int _wapi_connect(guint32 fd, const struct sockaddr *serv_addr,
 
 		fds.fd = fd;
 		fds.events = POLLOUT;
-		while (poll (&fds, 1, -1) == -1 &&
+		while (mono_poll (&fds, 1, -1) == -1 &&
 		       !_wapi_thread_cur_apc_pending ()) {
 			if (errno != EINTR) {
 				errnum = errno_to_WSA (errno, __func__);
-- 
2.11.4.GIT