Commit 79ffbf7f authored by Yang Tse's avatar Yang Tse
Browse files

MSVC adjustment

parent 4f0d286d

docs/examples/10-at-a-time.c

+3 −4
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
#include <errno.h>

#include <stdlib.h>

#include <string.h>

#ifndef WIN32

#  include <unistd.h>

#include <curl/multi.h>

#ifdef WIN32

#include <windows.h>

#endif

#include <curl/multi.h>



static const char *urls[] = {

  "http://www.microsoft.com",

docs/examples/anyauthput.c

+15 −2
Original line number Diff line number Diff line
@@ -9,10 +9,23 @@ 
 */



#include <stdio.h>

#include <stdint.h>

#include <fcntl.h>

#include <sys/stat.h>

#ifdef WIN32

#  include <io.h>

#else

#  include <stdint.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>

docs/examples/fopen.c

+3 −1
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ 


#include <stdio.h>

#include <string.h>

#ifndef WIN32

#  include <sys/time.h>

#endif

#include <stdlib.h>

#include <errno.h>

docs/examples/ftpuploadresume.c

+3 −0
Original line number Diff line number Diff line
@@ -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++ */

lib/easy.c

+8 −0
Original line number Diff line number Diff line
@@ -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.