Brian Dessent's fixes for cygwin builds

3 files changed, 6 insertions, 4 deletions

diff --git a/lib/if2ip.c b/lib/if2ip.c
index c975ae200..479428f80 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -33,7 +33,7 @@
 
 #include "if2ip.h"
 
-#if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN32__) && \
+#if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
     !defined(_AMIGASF)
 
diff --git a/lib/setup.h b/lib/setup.h
index 13f210a8a..cef40288e 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -79,10 +79,12 @@
  * Include header files for windows builds before redefining anything.
  * Use this preproessor block only to include or exclude windows.h,
  * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independant block.
+ * to any other further and independant block.  Under Cygwin things work
+ * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
+ * never be included.
  */
 
-#ifdef HAVE_WINDOWS_H
+#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__)
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
 #  endif
diff --git a/lib/url.c b/lib/url.c
index be6c99dc2..985ade1c5 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -157,7 +157,7 @@ static long ConnectionStore(struct SessionHandle *data,
 #ifndef USE_ARES
 /* not for Win32, unless it is cygwin
    not for ares builds */
-#if !defined(WIN32) || defined(__CYGWIN32__)
+#if !defined(WIN32) || defined(__CYGWIN__)
 
 #ifndef RETSIGTYPE
 #define RETSIGTYPE void