Ingo Ralf Blum's cygwin fixes

diff --git a/CHANGES b/CHANGES
index ff10534406f1ed67baa95ffbd367cf988de33682..186654afd491e314064d75500ccd02930919520e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                History of Changes
 Daniel (24 January 2001)
+- Ingo Ralf Blum submitted a series of patches required to get curl to compile
+  properly with cygwin.
+
 - Robert Weaver posted a fix for the win32 section of the curl_getenv() code
   that corrected a potential memory leak.
 

diff --git a/lib/if2ip.c b/lib/if2ip.c
index dc3138a0154403a95817c236bd3f42c21d1d51f0..87ead2b9e1b066cc7b432237c61a62df98a23069 100644 (file)
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 
-#if ! defined(WIN32) && ! defined(__BEOS__)
+#if ! defined(WIN32) && ! defined(__BEOS__) && !defined(__CYGWIN32__)
 
 #ifdef NEED_REENTRANT
 #define _REENTRANT

diff --git a/lib/url.c b/lib/url.c
index 06f18afff012e58dbad8f25e4eea39e77b4aa06f..dc825cce754e061bf87b0dc1422b31ac02cb4e12 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -533,7 +533,7 @@ CURLcode curl_setopt(CURL *curl, CURLoption option, ...)
   return CURLE_OK;
 }
 
-#ifndef WIN32
+#if !defined(WIN32)||defined(__CYGWIN32__)
 #ifndef RETSIGTYPE
 #define RETSIGTYPE void
 #endif
@@ -1306,7 +1306,7 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
   conn->serv_addr.sin_family = conn->hp->h_addrtype;
   conn->serv_addr.sin_port = htons(data->port);
 
-#ifndef WIN32 
+#if !defined(WIN32)||defined(__CYGWIN32__)
   /* We don't generally like checking for OS-versions, we should make this
      HAVE_XXXX based, although at the moment I don't have a decent test for
      this! */

diff --git a/src/main.c b/src/main.c
index 6016b3d578c431218b7be0c3ebf1bb152d61d5e7..2f3f1edc2b28a1ef336b49e324b212dcbd7290d2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -48,7 +48,7 @@
 /* This is now designed to have its own local setup.h */
 #include "setup.h"
 
-#ifdef WIN32
+#if defined(WIN32)&&!defined(__CYGWIN32__)
 #include <winsock.h>
 #endif
 
@@ -1713,7 +1713,7 @@ operate(struct Configurable *config, int argc, char *argv[])
       if(!config->errors)
         config->errors = stderr;
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN32__)
       if(!outfile && !(config->conf & CONF_GETTEXT)) {
         /* We get the output to stdout and we have not got the ASCII/text flag,
            then set stdout to be binary */