diff --git a/ghc/lib/misc/SocketPrim.lhs b/ghc/lib/misc/SocketPrim.lhs
index e76118574e100dfffbe88dda8f5a09712be6c83b..b63f663e104b3b14ba9a7ed83e5de3493acb3f31 100644
--- 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
-#if !defined(HAVE_WINSOCK_H) || defined(__CYGWIN32__)
+#if !defined(HAVE_WINSOCK_H) || defined(cygwin32_TARGET_OS)
 withSocketsDo x = x
 #else
 withSocketsDo act = do
diff --git a/ghc/lib/misc/cbits/initWinSock.c b/ghc/lib/misc/cbits/initWinSock.c
index d1c2b80677e7c6657dc0790f6b1c27c301ffe607..f928f3e55f8f7ba0273ffa32c6a43fc19cd7d187 100644
--- a/ghc/lib/misc/cbits/initWinSock.c
+++ b/ghc/lib/misc/cbits/initWinSock.c
@@ -5,7 +5,7 @@
 #include "stgio.h"
 
 
-#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__)
+#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #define USE_WINSOCK
 #endif
 
diff --git a/ghc/lib/std/cbits/closeFile.c b/ghc/lib/std/cbits/closeFile.c
index 331372439ffdd5c393ca4cd4fe51d75d5196b266..1e94d80a0f4a8aee2ffb4a13eea7e6347fcdd0ee 100644
--- a/ghc/lib/std/cbits/closeFile.c
+++ b/ghc/lib/std/cbits/closeFile.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: closeFile.c,v 1.5 1999/07/03 18:45:04 sof Exp $
+ * $Id: closeFile.c,v 1.6 1999/07/12 10:43:12 sof Exp $
  *
  * hClose Runtime Support
  */
@@ -9,7 +9,7 @@
 #include "Rts.h"
 #include "stgio.h"
 
-#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__)
+#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #define USE_WINSOCK
 #endif
 
diff --git a/ghc/lib/std/cbits/fileObject.c b/ghc/lib/std/cbits/fileObject.c
index 15d3c331f93a1d222e1a16b38a9907ede5ee8046..d209f6693f2877aebda113364982b6fab0a6df5e 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.4 1999/07/03 18:45:04 sof Exp $
+ * $Id: fileObject.c,v 1.5 1999/07/12 10:43:12 sof Exp $
  *
  * hPutStr Runtime Support
  */
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__)
+#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #define USE_WINSOCK
 #endif
 
diff --git a/ghc/lib/std/cbits/filePutc.c b/ghc/lib/std/cbits/filePutc.c
index d6137794c022930ebc02ae453a520007e7fdeb4a..b205116a1a2541350694dd9ec8995bc99a18d0b8 100644
--- a/ghc/lib/std/cbits/filePutc.c
+++ b/ghc/lib/std/cbits/filePutc.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: filePutc.c,v 1.6 1999/07/03 18:45:04 sof Exp $
+ * $Id: filePutc.c,v 1.7 1999/07/12 10:43:13 sof Exp $
  *
  * hPutChar Runtime Support
  */
@@ -10,7 +10,7 @@
 #include "stgio.h"
 #include "error.h"
 
-#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__)
+#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #define USE_WINSOCK
 #endif
 
diff --git a/ghc/lib/std/cbits/freeFile.c b/ghc/lib/std/cbits/freeFile.c
index 0c789be5af0777360c6b4b27f92e3e71da801994..a03a661c9f13968c677da45a12c81785b344c718 100644
--- a/ghc/lib/std/cbits/freeFile.c
+++ b/ghc/lib/std/cbits/freeFile.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: freeFile.c,v 1.5 1999/07/03 18:45:04 sof Exp $
+ * $Id: freeFile.c,v 1.6 1999/07/12 10:43:13 sof Exp $
  *
  * Giving up files
  */
@@ -10,7 +10,7 @@
 #include "stgio.h"
 #include "fileObject.h"
 
-#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__)
+#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #define USE_WINSOCK
 #endif
 
diff --git a/ghc/lib/std/cbits/readFile.c b/ghc/lib/std/cbits/readFile.c
index a848439dd4bb576c5265d86da5ecd3c7f0b73ff6..7445b3ed0db22a3619a9b6324d397ea7b533b033 100644
--- a/ghc/lib/std/cbits/readFile.c
+++ b/ghc/lib/std/cbits/readFile.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: readFile.c,v 1.6 1999/07/03 18:45:04 sof Exp $
+ * $Id: readFile.c,v 1.7 1999/07/12 10:43:13 sof Exp $
  *
  * hGetContents Runtime Support
  */
@@ -9,7 +9,7 @@
 #include "Rts.h"
 #include "stgio.h"
 
-#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__)
+#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #define USE_WINSOCK
 #endif
 
diff --git a/ghc/lib/std/cbits/writeFile.c b/ghc/lib/std/cbits/writeFile.c
index 194c1dd90359cf5f25c1a507db0fde59e0181b88..71e5a23d268ab1b1d0b93019c06cc4f554ce9c6f 100644
--- a/ghc/lib/std/cbits/writeFile.c
+++ b/ghc/lib/std/cbits/writeFile.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: writeFile.c,v 1.5 1999/07/03 18:45:04 sof Exp $
+ * $Id: writeFile.c,v 1.6 1999/07/12 10:43:13 sof Exp $
  *
  * hPutStr Runtime Support
  */
@@ -9,7 +9,7 @@
 #include "Rts.h"
 #include "stgio.h"
 
-#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__)
+#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #define USE_WINSOCK
 #endif