diff options
| author | sof <unknown> | 1999-07-03 18:45:04 +0000 |
|---|---|---|
| committer | sof <unknown> | 1999-07-03 18:45:04 +0000 |
| commit | e95d9ed181852e7b0b75d2d7c9ebed6057b60eea (patch) | |
| tree | 259be3951eb99a43b43e46ce427a40c95a438233 /ghc/lib/std/cbits/fileObject.c | |
| parent | dd951f2cd46fb0dc3075d3feee306c5f6d3dd670 (diff) | |
| download | haskell-e95d9ed181852e7b0b75d2d7c9ebed6057b60eea.tar.gz | |
[project @ 1999-07-03 18:45:04 by sof]
Don't compile in WinSock support under cygwin
Diffstat (limited to 'ghc/lib/std/cbits/fileObject.c')
| -rw-r--r-- | ghc/lib/std/cbits/fileObject.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ghc/lib/std/cbits/fileObject.c b/ghc/lib/std/cbits/fileObject.c index badb5c7ec4..15d3c331f9 100644 --- a/ghc/lib/std/cbits/fileObject.c +++ b/ghc/lib/std/cbits/fileObject.c @@ -1,7 +1,7 @@ /* * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998 * - * $Id: fileObject.c,v 1.3 1999/05/05 10:33:14 sof Exp $ + * $Id: fileObject.c,v 1.4 1999/07/03 18:45:04 sof Exp $ * * hPutStr Runtime Support */ @@ -12,7 +12,11 @@ #include <stdio.h> -#ifdef HAVE_WINSOCK_H +#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) +#define USE_WINSOCK +#endif + +#ifdef USE_WINSOCK #include <winsock.h> #endif @@ -181,7 +185,7 @@ IOFileObject* fo; if ((count = ( -#ifdef HAVE_WINSOCK_H +#ifdef USE_WINSOCK fo->flags & FILEOBJ_WINSOCK ? recv(fo->fd, p, len, 0) : read(fo->fd, p, len))) <= 0 ) { |