diff options
| author | Ross Paterson <ross@soi.city.ac.uk> | 2006-08-11 12:40:30 +0000 |
|---|---|---|
| committer | Ross Paterson <ross@soi.city.ac.uk> | 2006-08-11 12:40:30 +0000 |
| commit | 4275eb7f41b4b9a9c97ea3b23b2d7c0ebd241c96 (patch) | |
| tree | a3aa42ad5994b543e62ca95b1b17bea749d039ca /libraries/base/cbits/inputReady.c | |
| parent | 57ea42b66c6b08d9a4ae3f444a771fd99fd94646 (diff) | |
| download | haskell-4275eb7f41b4b9a9c97ea3b23b2d7c0ebd241c96.tar.gz | |
reduce dependency on ghcconfig.h
The only remaining use is in cbits/dirUtils.h, which tests solaris2_HOST_OS
(Also System.Info uses ghcplatform.h and several modules import MachDeps.h
to get SIZEOF_* and ALIGNMENT_* from ghcautoconf.h)
Diffstat (limited to 'libraries/base/cbits/inputReady.c')
| -rw-r--r-- | libraries/base/cbits/inputReady.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libraries/base/cbits/inputReady.c b/libraries/base/cbits/inputReady.c index 2949e9494b..f827fe5def 100644 --- a/libraries/base/cbits/inputReady.c +++ b/libraries/base/cbits/inputReady.c @@ -17,10 +17,10 @@ int inputReady(int fd, int msecs, int isSock) { if -#ifndef mingw32_HOST_OS - ( 1 ) { -#else +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) ( isSock ) { +#else + ( 1 ) { #endif int maxfd, ready; fd_set rfd; @@ -45,7 +45,7 @@ inputReady(int fd, int msecs, int isSock) /* 1 => Input ready, 0 => not ready, -1 => error */ return (ready); } -#ifdef mingw32_HOST_OS +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) else { DWORD rc; HANDLE hFile = (HANDLE)_get_osfhandle(fd); |