1
0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 14:35:03 -05:00

Ingo Ralf Blum's cygwin fixes

This commit is contained in:
Daniel Stenberg 2001-01-24 14:44:05 +00:00
parent 1716dbb68a
commit 29bcba9a90
4 changed files with 8 additions and 5 deletions

View File

@ -6,6 +6,9 @@
History of Changes History of Changes
Daniel (24 January 2001) 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 - Robert Weaver posted a fix for the win32 section of the curl_getenv() code
that corrected a potential memory leak. that corrected a potential memory leak.

View File

@ -32,7 +32,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#if ! defined(WIN32) && ! defined(__BEOS__) #if ! defined(WIN32) && ! defined(__BEOS__) && !defined(__CYGWIN32__)
#ifdef NEED_REENTRANT #ifdef NEED_REENTRANT
#define _REENTRANT #define _REENTRANT

View File

@ -533,7 +533,7 @@ CURLcode curl_setopt(CURL *curl, CURLoption option, ...)
return CURLE_OK; return CURLE_OK;
} }
#ifndef WIN32 #if !defined(WIN32)||defined(__CYGWIN32__)
#ifndef RETSIGTYPE #ifndef RETSIGTYPE
#define RETSIGTYPE void #define RETSIGTYPE void
#endif #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_family = conn->hp->h_addrtype;
conn->serv_addr.sin_port = htons(data->port); 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 /* 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 HAVE_XXXX based, although at the moment I don't have a decent test for
this! */ this! */

View File

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