From 990e56fb13e1e538415a69c69754b21609a14ed6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 8 Jun 2006 06:12:30 +0000 Subject: Brian Dessent's fixes for cygwin builds --- src/main.c | 4 ++-- src/setup.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index 0392d89a3..cf40b0e2c 100644 --- a/src/main.c +++ b/src/main.c @@ -3242,7 +3242,7 @@ static void free_config_fields(struct Configurable *config) curl_slist_free_all(config->headers); } -#if defined(WIN32) && !defined(__CYGWIN32__) +#if defined(WIN32) && !defined(__CYGWIN__) /* Function to find CACert bundle on a Win32 platform using SearchPath. * (SearchPath is already declared via inclusions done in setup header file) @@ -3485,7 +3485,7 @@ operate(struct Configurable *config, int argc, char *argv[]) if(env) curl_free(env); -#if defined(WIN32) && !defined(__CYGWIN32__) +#if defined(WIN32) && !defined(__CYGWIN__) else FindWin32CACert(config, "curl-ca-bundle.crt"); #endif diff --git a/src/setup.h b/src/setup.h index 61726d61b..f07b3a7b7 100644 --- a/src/setup.h +++ b/src/setup.h @@ -81,10 +81,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. ) 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 -- cgit v1.2.3