No need to check for Cygwin when including <winsock2.h>, this is

already check for by configure.  Thus, revert change from 2002-07-07.

diff --git a/libguile/guile.c b/libguile/guile.c
index 23e41d0..ae17a96 100644 (file)
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -58,8 +58,7 @@
 #include <libltdl/ltdl.h>
 #endif
 
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 

diff --git a/libguile/iselect.h b/libguile/iselect.h
index a7db870..1d27013 100644 (file)
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -68,8 +68,7 @@
 #include <sys/select.h>
 #endif
 
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 

diff --git a/libguile/net_db.c b/libguile/net_db.c
index d0602ba..ecb075c 100644 (file)
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -65,8 +65,7 @@
 
 #include <sys/types.h>
 
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #else
 #include <sys/socket.h>

diff --git a/libguile/posix.c b/libguile/posix.c
index e741697..066e0f9 100644 (file)
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -96,8 +96,7 @@ extern char *ttyname();
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 

diff --git a/libguile/socket.c b/libguile/socket.c
index 49501b7..86b61ac 100644 (file)
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -68,8 +68,7 @@
 #include <unistd.h>
 #endif
 #include <sys/types.h>
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #else
 #include <sys/socket.h>