diff options
| author | simonmar <unknown> | 2001-12-21 15:07:26 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2001-12-21 15:07:26 +0000 |
| commit | ceb68b9118fa883e88abfaa532fc78f6640cf17f (patch) | |
| tree | b90b04a394fee4abd0cb09205120bee964684d7b /libraries/base/cbits/inputReady.c | |
| parent | b83cfb91b4d36d148ebe171d31e2676c8f10f371 (diff) | |
| download | haskell-ceb68b9118fa883e88abfaa532fc78f6640cf17f.tar.gz | |
[project @ 2001-12-21 15:07:20 by simonmar]
Merge up to the ghc/lib/std on the HEAD (tagged as
new-libraries-last-merged).
Diffstat (limited to 'libraries/base/cbits/inputReady.c')
| -rw-r--r-- | libraries/base/cbits/inputReady.c | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/libraries/base/cbits/inputReady.c b/libraries/base/cbits/inputReady.c index 79a605a67b..6585de91cc 100644 --- a/libraries/base/cbits/inputReady.c +++ b/libraries/base/cbits/inputReady.c @@ -1,7 +1,7 @@ /* * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998 * - * $Id: inputReady.c,v 1.3 2001/08/17 12:50:34 simonmar Exp $ + * $Id: inputReady.c,v 1.4 2001/12/21 15:07:26 simonmar Exp $ * * hReady Runtime Support */ @@ -16,17 +16,18 @@ * *character* from this file object without blocking?' */ int -inputReady(int fd, int msecs) +inputReady(int fd, int msecs, int isSock) { + if #ifndef mingw32_TARGET_OS + ( 1 ) { +#else + ( isSock ) { +#endif int maxfd, ready; fd_set rfd; struct timeval tv; -#endif -#ifdef mingw32_TARGET_OS - return 1; -#else FD_ZERO(&rfd); FD_SET(fd, &rfd); @@ -45,6 +46,23 @@ inputReady(int fd, int msecs) /* 1 => Input ready, 0 => not ready, -1 => error */ return (ready); - +#ifdef mingw32_TARGET_OS + } else { + DWORD rc; + HANDLE hFile = (HANDLE)_get_osfhandle(fd); + + rc = MsgWaitForMultipleObjects( 1, + &hFile, + FALSE, /* wait all */ + msecs, /*millisecs*/ + QS_ALLEVENTS); + + /* 1 => Input ready, 0 => not ready, -1 => error */ + switch (rc) { + case WAIT_TIMEOUT: return 0; + case WAIT_OBJECT_0: return 1; + default: return -1; + } + } #endif -} + }} |