[project @ 1999-07-03 19:15:26 by sof]

Don't use WinSock under cygwin

diff --git a/ghc/lib/misc/SocketPrim.lhs b/ghc/lib/misc/SocketPrim.lhs
index d88e3d7..e761185 100644 (file)
--- a/ghc/lib/misc/SocketPrim.lhs
+++ b/ghc/lib/misc/SocketPrim.lhs
@@ -1252,7 +1252,7 @@ use @withSocketsDo@...:
 
 \begin{code}
 withSocketsDo :: IO a -> IO a
-#ifndef _WIN32
+#if !defined(HAVE_WINSOCK_H) || defined(__CYGWIN32__)
 withSocketsDo x = x
 #else
 withSocketsDo act = do

diff --git a/ghc/lib/misc/cbits/ghcSockets.h b/ghc/lib/misc/cbits/ghcSockets.h
index 175f8b8..f2f636a 100644 (file)
--- 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 7ea4de6..d1c2b80 100644 (file)
--- 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 ()
 {