From a7913a62a9f86ba70f890b55e106293787e7d729 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 10 Oct 2004 03:39:59 +0000 Subject: If long is 8 bytes we can use strtol() to get 64 bit numbers and won't need our strtoll() replacement function. --- lib/strtoofft.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/strtoofft.h b/lib/strtoofft.h index c92cbeff7..e23e1483e 100644 --- a/lib/strtoofft.h +++ b/lib/strtoofft.h @@ -38,7 +38,7 @@ * not, should try to emulate its functionality. At any rate, we define * 'strtoofft' such that it can be used to work with curl_off_t's regardless. */ -#if SIZEOF_CURL_OFF_T > 4 +#if (SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8) #if HAVE_STRTOLL #define curlx_strtoofft strtoll #else /* HAVE_STRTOLL */ @@ -53,8 +53,8 @@ curl_off_t curlx_strtoll(const char *nptr, char **endptr, int base); #endif /* MSVC7 or later */ #endif /* HAVE_STRTOLL */ -#else /* SIZEOF_CURL_OFF_T > 4 */ -/* simply use strtol() to get 32bit numbers */ +#else /* (SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8) */ +/* simply use strtol() to get numbers, either 32 or 64 bit */ #define curlx_strtoofft strtol #endif -- cgit v1.2.3