Commit 29bcba9a authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Ingo Ralf Blum's cygwin fixes

parent 1716dbb6

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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.

lib/if2ip.c

+1 −1
Original line number Diff line number Diff line
@@ -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

lib/url.c

+2 −2
Original line number Diff line number Diff line
@@ -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! */

src/main.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */