MSVC adjustment

This commit is contained in:
Yang Tse
2008-08-31 12:12:35 +00:00
parent 4f0d286d2c
commit 79ffbf7fe1
5 changed files with 32 additions and 7 deletions

View File

@@ -16,11 +16,10 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifndef WIN32
# include <unistd.h> # include <unistd.h>
#include <curl/multi.h>
#ifdef WIN32
#include <windows.h>
#endif #endif
#include <curl/multi.h>
static const char *urls[] = { static const char *urls[] = {
"http://www.microsoft.com", "http://www.microsoft.com",

View File

@@ -9,10 +9,23 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #ifdef WIN32
# include <io.h>
#else
# include <stdint.h>
# include <unistd.h> # include <unistd.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#ifdef _MSC_VER
# ifdef _WIN64
typedef __int64 intptr_t;
# else
typedef int intptr_t;
# endif
#endif
#include <curl/curl.h> #include <curl/curl.h>

View File

@@ -45,7 +45,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifndef WIN32
# include <sys/time.h> # include <sys/time.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>

View File

@@ -21,6 +21,9 @@
#include <curl/curl.h> #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, /* The MinGW headers are missing a few Win32 function definitions,
you shouldn't need this if you use VC++ */ you shouldn't need this if you use VC++ */

View File

@@ -205,6 +205,10 @@ static long init_flags;
#define system_strdup strdup #define system_strdup strdup
#endif #endif
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(disable:4232) /* MSVC extension, dllimport identity */
#endif
#ifndef __SYMBIAN32__ #ifndef __SYMBIAN32__
/* /*
* If a memory-using function (like curl_getenv) is used before * 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; curl_calloc_callback Curl_ccalloc;
#endif #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 * curl_global_init() globally initializes cURL given a bitwise set of the
* different features of what to initialize. * different features of what to initialize.