summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2002-07-10 19:40:43 +0000
committerMarius Vollmer <mvo@zagadka.de>2002-07-10 19:40:43 +0000
commitf87c105ae3ffbf1dadddf7685e9f8d176aa536d4 (patch)
tree99156e43b5b39d8b4f82f4f7954119f080ce4f01
parentd2e13cf79d62ebab9df0a37d38451abaa74546d6 (diff)
downloadguile-f87c105ae3ffbf1dadddf7685e9f8d176aa536d4.tar.gz
No need to check for Cygwin when including <winsock2.h>, this is
already check for by configure. Thus, revert change from 2002-07-07.
-rw-r--r--libguile/guile.c3
-rw-r--r--libguile/iselect.h3
-rw-r--r--libguile/net_db.c3
-rw-r--r--libguile/posix.c3
-rw-r--r--libguile/socket.c3
5 files changed, 5 insertions, 10 deletions
diff --git a/libguile/guile.c b/libguile/guile.c
index 23e41d0ac..ae17a9606 100644
--- 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 a7db8706b..1d27013fb 100644
--- 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 d0602ba23..ecb075c8b 100644
--- 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 e7416974a..066e0f90b 100644
--- 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 49501b72c..86b61aca1 100644
--- 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>