generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Brian Dessent's fixes for cygwin builds

Browse Source
This commit is contained in:
Daniel Stenberg
2006-06-08 06:12:30 +00:00
parent 2bd3033f68
commit 990e56fb13
8 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@@ -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

6
src/setup.h
View File

@@ -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. <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