Do not include <winsock2.h> on Cygwin even when we have it.

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

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

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

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

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