Commit 9849c6b8 authored by Yang Tse's avatar Yang Tse
Browse files

Adjustments to better select/differentiate when large/small file 

support is provided using WIN32 functions directly.
parent 9bb5da96

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Yang Tse (22 Aug 2008) 
- Improved libcurl's internal curl_m*printf() functions integral data type

  size and signedness handling.



- Internal adjustments to better select/differentiate when large/small file

  support is provided using WIN32 functions directly.



Daniel Fandrich (20 Aug 2008)

- Added an edited version of Vincent Le Normand's documentation of SFTP quote

  commands to the man pages.

lib/config-win32.h

+16 −0
Original line number Diff line number Diff line
@@ -390,6 +390,22 @@ 
#  endif

#endif



/* ---------------------------------------------------------------- */

/*                        LARGE FILE SUPPORT                        */

/* ---------------------------------------------------------------- */



#if defined(_MSC_VER) && !defined(_WIN32_WCE)

#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)

#    define USE_WIN32_LARGE_FILES

#  else

#    define USE_WIN32_SMALL_FILES

#  endif

#endif



#if !defined(USE_WIN32_LARGE_FILES) && !defined(USE_WIN32_SMALL_FILES)

#  define USE_WIN32_SMALL_FILES

#endif



/* ---------------------------------------------------------------- */

/*                           LDAP SUPPORT                           */

/* ---------------------------------------------------------------- */

lib/config-win32ce.h

+16 −0
Original line number Diff line number Diff line
@@ -340,6 +340,22 @@ 
#  endif

#endif



/* ---------------------------------------------------------------- */

/*                        LARGE FILE SUPPORT                        */

/* ---------------------------------------------------------------- */



#if defined(_MSC_VER) && !defined(_WIN32_WCE)

#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)

#    define USE_WIN32_LARGE_FILES

#  else

#    define USE_WIN32_SMALL_FILES

#  endif

#endif



#if !defined(USE_WIN32_LARGE_FILES) && !defined(USE_WIN32_SMALL_FILES)

#  define USE_WIN32_SMALL_FILES

#endif



/* ---------------------------------------------------------------- */

/*                           LDAP SUPPORT                           */

/* ---------------------------------------------------------------- */

lib/setup.h

+26 −11
Original line number Diff line number Diff line
@@ -270,18 +270,33 @@ 
  #include <clib.h>

#endif



/*

 * Large file (>2Gb) support using WIN32 functions.

 */



/* To make large file support transparent even on Windows */

#if defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T > 4)

#include <sys/stat.h>   /* must come first before we redefine stat() */

#ifdef USE_WIN32_LARGE_FILES

#  include <io.h>

#define lseek(x,y,z) _lseeki64(x, y, z)

#  include <sys/types.h>

#  include <sys/stat.h>

#  define lseek(fdes,offset,whence)  _lseeki64(fdes, offset, whence)

#  define fstat(fdes,stp)            _fstati64(fdes, stp)

#  define stat(fname,stp)            _stati64(fname, stp)

#  define struct_stat                struct _stati64

#define stat(file,st) _stati64(file,st)

#define fstat(fd,st) _fstati64(fd,st)

#else

#define struct_stat struct stat

#endif /* Win32 with large file support */

#endif



/*

 * Small file (<2Gb) support using WIN32 functions.

 */



#ifdef USE_WIN32_SMALL_FILES

#  include <io.h>

#  include <sys/types.h>

#  include <sys/stat.h>

#  define lseek(fdes,offset,whence)  _lseek(fdes, offset, whence)

#  define fstat(fdes,stp)            _fstat(fdes, stp)

#  define stat(fname,stp)            _stat(fname, stp)

#  define struct_stat                struct _stat

#endif





/* Below we define some functions. They should

src/config-win32.h

+16 −0
Original line number Diff line number Diff line
@@ -235,6 +235,22 @@ 
#  endif

#endif



/* ---------------------------------------------------------------- */

/*                        LARGE FILE SUPPORT                        */

/* ---------------------------------------------------------------- */



#if defined(_MSC_VER) && !defined(_WIN32_WCE)

#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)

#    define USE_WIN32_LARGE_FILES

#  else

#    define USE_WIN32_SMALL_FILES

#  endif

#endif



#if !defined(USE_WIN32_LARGE_FILES) && !defined(USE_WIN32_SMALL_FILES)

#  define USE_WIN32_SMALL_FILES

#endif



/* ---------------------------------------------------------------- */

/*                       ADDITIONAL DEFINITIONS                     */

/* ---------------------------------------------------------------- */