[project @ 1999-07-12 10:43:10 by sof]

Cygwin B19 compatibility fixes

diff --git a/ghc/lib/misc/SocketPrim.lhs b/ghc/lib/misc/SocketPrim.lhs
index e761185..b63f663 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
-#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 d1c2b80..f928f3e 100644 (file)
--- 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 3313724..1e94d80 100644 (file)
--- 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 15d3c33..d209f66 100644 (file)
--- 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 d613779..b205116 100644 (file)
--- 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 0c789be..a03a661 100644 (file)
--- 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 a848439..7445b3e 100644 (file)
--- 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 194c1dd..71e5a23 100644 (file)
--- 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