Francois Gouget : server: Make sock_check_pollhup() more reliable on Solaris.
Alexandre Julliard
julliard at winehq.org
Mon Nov 29 13:38:44 CST 2010
Module: wine
Branch: master
Commit: c4c03180b0868fe93de4a5ccf52ba76bb00ffcab
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c03180b0868fe93de4a5ccf52ba76bb00ffcab
Author: Francois Gouget <fgouget at free.fr>
Date: Fri Nov 26 18:08:30 2010 +0100
server: Make sock_check_pollhup() more reliable on Solaris.
---
server/sock.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/sock.c b/server/sock.c
index 04ae748..d37a316 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -203,7 +203,8 @@ static sock_shutdown_t sock_check_pollhup(void)
pfd.events = POLLIN;
pfd.revents = 0;
- n = poll( &pfd, 1, 0 );
+ /* Solaris' poll() sometimes returns nothing if given a 0ms timeout here */
+ n = poll( &pfd, 1, 1 );
if ( n != 1 ) goto out; /* error or timeout */
if ( pfd.revents & POLLHUP )
ret = SOCK_SHUTDOWN_POLLHUP;
More information about the wine-cvs
mailing list