diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config-win32.h | 16 | ||||
| -rw-r--r-- | src/main.c | 32 |
2 files changed, 41 insertions, 7 deletions
diff --git a/src/config-win32.h b/src/config-win32.h index 84a16fdc8..654d892d8 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -236,6 +236,22 @@ #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 */ /* ---------------------------------------------------------------- */ diff --git a/src/main.c b/src/main.c index b70219189..6c149cfb6 100644 --- a/src/main.c +++ b/src/main.c @@ -210,14 +210,32 @@ typedef enum { #include "curlmsg_vms.h" #endif -/* Support uploading and resuming of >2GB files +/* + * Large file support (>2Gb) using WIN32 functions. */ -#if defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T > 4) -#define lseek(x,y,z) _lseeki64(x, y, z) -#define struct_stat struct _stati64 -#define stat(file,st) _stati64(file,st) -#else -#define struct_stat struct stat + +#ifdef USE_WIN32_LARGE_FILES +# include <io.h> +# 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 +#endif + +/* + * Small file support (<2Gb) 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 #ifdef CURL_DOES_CONVERSIONS |