diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-01-22 12:46:07 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-01-22 12:46:07 +0000 |
| commit | 5bd0471315baa7c9ecfed6ebe7e277d656d803f3 (patch) | |
| tree | c68892b624f47a6f7868b0ff93636bb76cf308b6 | |
| parent | b791e158f0e04a518dea19fdaf0bfbf71b343c64 (diff) | |
use curl_off_t instead of off_t
| -rw-r--r-- | src/config.h.in | 4 | ||||
| -rw-r--r-- | src/main.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/config.h.in b/src/config.h.in index c9f5e7c2a..9f50fa3f4 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -80,8 +80,8 @@ /* Define to 1 if you have the `strtoll' function. */ #undef HAVE_STRTOLL -/* The size of a `off_t', as computed by sizeof. */ -#undef SIZEOF_OFF_T +/* The size of a `curl_off_t', as computed by sizeof. */ +#undef SIZEOF_CURL_OFF_T /* If zlib is available */ #undef HAVE_LIBZ diff --git a/src/main.c b/src/main.c index 2c13c702f..ab078de11 100644 --- a/src/main.c +++ b/src/main.c @@ -392,14 +392,14 @@ struct Configurable { bool resume_from_current; bool disable_epsv; bool disable_eprt; - off_t resume_from; + curl_off_t resume_from; char *postfields; long postfieldsize; char *referer; long timeout; long connecttimeout; long maxredirs; - off_t max_filesize; + curl_off_t max_filesize; char *headerfile; char *ftpport; char *iface; @@ -996,15 +996,15 @@ static int str2num(long *val, char *str) * @param str the buffer containing the offset * @return zero if successful, non-zero if failure. */ -static int str2offset(off_t *val, char *str) +static int str2offset(curl_off_t *val, char *str) { -#if SIZEOF_OFF_T > 4 +#if SIZEOF_CURL_OFF_T > 4 /* Ugly, but without going through a bunch of rigmarole, we don't have the * definitions for LLONG_{MIN,MAX} or LONG_LONG_{MIN,MAX}. */ #ifndef LLONG_MAX -#define LLONG_MAX (off_t)0x7FFFFFFFFFFFFFFFLL -#define LLONG_MIN (off_t)0x8000000000000000LL +#define LLONG_MAX (curl_off_t)0x7FFFFFFFFFFFFFFFLL +#define LLONG_MIN (curl_off_t)0x8000000000000000LL #endif #ifdef HAVE_STRTOLL @@ -2281,7 +2281,7 @@ struct ProgressData { double prev; int width; FILE *out; /* where to write everything to */ - off_t initial_size; + curl_off_t initial_size; }; int myprogress (void *clientp, @@ -2583,7 +2583,7 @@ operate(struct Configurable *config, int argc, char *argv[]) bool infdfopen; FILE *headerfilep = NULL; char *urlbuffer=NULL; - off_t uploadfilesize; /* -1 means unknown */ + curl_off_t uploadfilesize; /* -1 means unknown */ bool stillflags=TRUE; bool allocuseragent=FALSE; |