diff options
| author | sof <unknown> | 1999-07-03 19:15:27 +0000 |
|---|---|---|
| committer | sof <unknown> | 1999-07-03 19:15:27 +0000 |
| commit | 92a747a7d5d1733ad376335904a2008332f10a0f (patch) | |
| tree | d9032ef1b75720a9d41e6c2e45a94be0bce6bba5 /ghc/lib/misc/cbits | |
| parent | e95d9ed181852e7b0b75d2d7c9ebed6057b60eea (diff) | |
| download | haskell-92a747a7d5d1733ad376335904a2008332f10a0f.tar.gz | |
[project @ 1999-07-03 19:15:26 by sof]
Don't use WinSock under cygwin
Diffstat (limited to 'ghc/lib/misc/cbits')
| -rw-r--r-- | ghc/lib/misc/cbits/ghcSockets.h | 4 | ||||
| -rw-r--r-- | ghc/lib/misc/cbits/initWinSock.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ghc/lib/misc/cbits/ghcSockets.h b/ghc/lib/misc/cbits/ghcSockets.h index 175f8b8868..f2f636a11f 100644 --- a/ghc/lib/misc/cbits/ghcSockets.h +++ b/ghc/lib/misc/cbits/ghcSockets.h @@ -1,7 +1,7 @@ #ifndef GHC_SOCKETS_H #define GHC_SOCKETS_H -#ifdef HAVE_WINSOCK_H +#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) #include <winsock.h> #else @@ -94,7 +94,7 @@ StgInt setSocketOption__ (StgInt, StgInt, StgInt); StgInt writeDescriptor (StgInt, StgAddr, StgInt); /* initWinSock.c */ -#ifdef _WIN32 +#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) StgInt initWinSock(); void shutdownWinSock(); #endif diff --git a/ghc/lib/misc/cbits/initWinSock.c b/ghc/lib/misc/cbits/initWinSock.c index 7ea4de6a9f..d1c2b80677 100644 --- a/ghc/lib/misc/cbits/initWinSock.c +++ b/ghc/lib/misc/cbits/initWinSock.c @@ -5,10 +5,13 @@ #include "stgio.h" -#ifdef _WIN32 +#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) +#define USE_WINSOCK +#endif -/* Initialising WinSock... */ +#ifdef USE_WINSOCK +/* Initialising WinSock... */ StgInt initWinSock () { |