From 34750cc738214008a6098e554584c2d88677ed92 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 10 Oct 2004 03:28:51 +0000 Subject: [PATCH] Use LL suffix for long long constants if the compiler supports it, to prevent warnings. --- lib/strtoofft.c | 4 ++-- lib/strtoofft.h | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/strtoofft.c b/lib/strtoofft.c index f6abc20a0..391f80d24 100644 --- a/lib/strtoofft.c +++ b/lib/strtoofft.c @@ -112,9 +112,9 @@ curlx_strtoll(const char *nptr, char **endptr, int base) } else { if (is_negative) - value = 0x8000000000000000L; + value = CURL_LLONG_MIN; else - value = 0x7FFFFFFFFFFFFFFFL; + value = CURL_LLONG_MAX; errno = ERANGE; } diff --git a/lib/strtoofft.h b/lib/strtoofft.h index 4c5d2652b..c92cbeff7 100644 --- a/lib/strtoofft.h +++ b/lib/strtoofft.h @@ -1,10 +1,10 @@ #ifndef _CURL_STRTOOFFT_H #define _CURL_STRTOOFFT_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. @@ -12,7 +12,7 @@ * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -58,5 +58,13 @@ curl_off_t curlx_strtoll(const char *nptr, char **endptr, int base); #define curlx_strtoofft strtol #endif +#ifdef HAVE_LL +#define CURL_LLONG_MIN 0x8000000000000000LL +#define CURL_LLONG_MAX 0x7FFFFFFFFFFFFFFFLL +#else +#define CURL_LLONG_MIN 0x8000000000000000L +#define CURL_LLONG_MAX 0x7FFFFFFFFFFFFFFFL +#endif + #endif