diff options
| -rw-r--r-- | docs/examples/10-at-a-time.c | 7 | ||||
| -rw-r--r-- | docs/examples/anyauthput.c | 17 | ||||
| -rw-r--r-- | docs/examples/fopen.c | 4 | ||||
| -rw-r--r-- | docs/examples/ftpuploadresume.c | 3 | ||||
| -rw-r--r-- | lib/easy.c | 8 |
5 files changed, 32 insertions, 7 deletions
diff --git a/docs/examples/10-at-a-time.c b/docs/examples/10-at-a-time.c index 0b2a20ed8..13ff196c8 100644 --- a/docs/examples/10-at-a-time.c +++ b/docs/examples/10-at-a-time.c @@ -16,11 +16,10 @@ #include <errno.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> -#include <curl/multi.h> -#ifdef WIN32 -#include <windows.h> +#ifndef WIN32 +# include <unistd.h> #endif +#include <curl/multi.h> static const char *urls[] = { "http://www.microsoft.com", diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c index 41531f7aa..11c9d3c77 100644 --- a/docs/examples/anyauthput.c +++ b/docs/examples/anyauthput.c @@ -9,10 +9,23 @@ */ #include <stdio.h> -#include <stdint.h> #include <fcntl.h> +#ifdef WIN32 +# include <io.h> +#else +# include <stdint.h> +# include <unistd.h> +#endif +#include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> + +#ifdef _MSC_VER +# ifdef _WIN64 + typedef __int64 intptr_t; +# else + typedef int intptr_t; +# endif +#endif #include <curl/curl.h> diff --git a/docs/examples/fopen.c b/docs/examples/fopen.c index 9801e15c1..0a9e9e30d 100644 --- a/docs/examples/fopen.c +++ b/docs/examples/fopen.c @@ -45,7 +45,9 @@ #include <stdio.h> #include <string.h> -#include <sys/time.h> +#ifndef WIN32 +# include <sys/time.h> +#endif #include <stdlib.h> #include <errno.h> diff --git a/docs/examples/ftpuploadresume.c b/docs/examples/ftpuploadresume.c index d8d1c5b88..362711c33 100644 --- a/docs/examples/ftpuploadresume.c +++ b/docs/examples/ftpuploadresume.c @@ -21,6 +21,9 @@ #include <curl/curl.h> +#if defined(_MSC_VER) && (_MSC_VER < 1300) +# error _snscanf requires MSVC 7.0 or later. +#endif /* The MinGW headers are missing a few Win32 function definitions, you shouldn't need this if you use VC++ */ diff --git a/lib/easy.c b/lib/easy.c index 0f6154448..d83a88511 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -205,6 +205,10 @@ static long init_flags; #define system_strdup strdup #endif +#if defined(_MSC_VER) && defined(_DLL) +# pragma warning(disable:4232) /* MSVC extension, dllimport identity */ +#endif + #ifndef __SYMBIAN32__ /* * If a memory-using function (like curl_getenv) is used before @@ -227,6 +231,10 @@ curl_strdup_callback Curl_cstrdup; curl_calloc_callback Curl_ccalloc; #endif +#if defined(_MSC_VER) && defined(_DLL) +# pragma warning(default:4232) /* MSVC extension, dllimport identity */ +#endif + /** * curl_global_init() globally initializes cURL given a bitwise set of the * different features of what to initialize. |