diff options
| author | Tom McLaughlin <tmclaugh@FreeBSD.org> | 2006-01-14 21:34:06 +0000 |
|---|---|---|
| committer | Tom McLaughlin <tmclaugh@FreeBSD.org> | 2006-01-14 21:34:06 +0000 |
| commit | 6a61c03f297180c6dbabffdc320266f1afb51aa4 (patch) | |
| tree | 8beaddec828a2f66064b59cb0cf58eacad06f281 /lang/mono/files/patch-mono_io-layer_sockets.c | |
| parent | - Remove expired ports (diff) | |
Update to 1.1.12.1
Project by: BSD# <www.mono-project.com/Mono:FreeBSD>
Notes
Notes:
svn path=/head/; revision=153502
Diffstat (limited to 'lang/mono/files/patch-mono_io-layer_sockets.c')
| -rw-r--r-- | lang/mono/files/patch-mono_io-layer_sockets.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/lang/mono/files/patch-mono_io-layer_sockets.c b/lang/mono/files/patch-mono_io-layer_sockets.c deleted file mode 100644 index 9a717a487d53..000000000000 --- a/lang/mono/files/patch-mono_io-layer_sockets.c +++ /dev/null @@ -1,57 +0,0 @@ ---- mono/io-layer/sockets.c.orig Sat May 7 14:54:36 2005 -+++ mono/io-layer/sockets.c Wed Oct 12 22:04:38 2005 -@@ -846,35 +846,32 @@ - return(SOCKET_ERROR); - } - -- if (command != FIONBIO && -- command != FIONREAD && -- command != SIOCATMARK) { -- /* Not listed in the MSDN specs, but ioctl(2) returns -- * this if command is invalid -- */ -- WSASetLastError (WSAEINVAL); -- return(SOCKET_ERROR); -- } -- -+ switch(command){ -+ case FIONBIO: - #ifdef O_NONBLOCK - /* This works better than ioctl(...FIONBIO...) on Linux (it causes - * connect to return EINPROGRESS, but the ioctl doesn't seem to) - */ -- if (command == FIONBIO) { -- ret = fcntl (fd, F_GETFL, 0); -- if (ret != -1) { -- if (*(gboolean *)arg) { -- ret |= O_NONBLOCK; -- } else { -- ret &= ~O_NONBLOCK; -+ ret = fcntl(fd, F_GETFL, 0); -+ if (ret != -1) { -+ if (*(gboolean *)arg) { -+ ret |= O_NONBLOCK; -+ } else { -+ ret &= ~O_NONBLOCK; -+ } -+ ret = fcntl(fd, F_SETFL, ret); - } -- ret = fcntl (fd, F_SETFL, ret); -- } -- } else - #endif /* O_NONBLOCK */ -- { -- ret = ioctl (fd, command, arg); -+ break; -+ case FIONREAD: -+ case SIOCATMARK: -+ ret = ioctl (fd, command, arg); -+ break; -+ default: -+ WSASetLastError (WSAEINVAL); -+ return(SOCKET_ERROR); - } -+ - if (ret == -1) { - gint errnum = errno; - #ifdef DEBUG |